Skip to content

feat: advanced sync #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 7, 2021
Merged

feat: advanced sync #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a0d8fe
feat: advanced sync
denis-codefresh Dec 6, 2021
060a568
feat: codegen
denis-codefresh Dec 7, 2021
e81c6e4
feat: codegen
denis-codefresh Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ ifneq ($(GIT_TAG),)
override LDFLAGS += -X github.com/argoproj/argo-workflows/v3.gitTag=${GIT_TAG}
endif

ifndef $(GOPATH)
GOPATH=$(shell go env GOPATH)
export GOPATH
endif

ARGOEXEC_PKGS := $(shell echo cmd/argoexec && go list -f '{{ join .Deps "\n" }}' ./cmd/argoexec/ | grep 'argoproj/argo-workflows/v3/' | cut -c 39-)
CLI_PKGS := $(shell echo cmd/argo && go list -f '{{ join .Deps "\n" }}' ./cmd/argo/ | grep 'argoproj/argo-workflows/v3/' | cut -c 39-)
CONTROLLER_PKGS := $(shell echo cmd/workflow-controller && go list -f '{{ join .Deps "\n" }}' ./cmd/workflow-controller/ | grep 'argoproj/argo-workflows/v3/' | cut -c 39-)
Expand Down Expand Up @@ -130,11 +135,6 @@ define protoc

endef

ifndef $(GOPATH)
GOPATH=$(shell go env GOPATH)
export GOPATH
endif

.PHONY: build
build: clis images

Expand Down
28 changes: 28 additions & 0 deletions api/jsonschema/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5592,6 +5592,13 @@
"name": {
"description": "name of the mutex",
"type": "string"
},
"selectors": {
"description": "Selectors is a list of references to dynamic values (like parameters, labels, annotations) that can be added to mutex key to make concurrency more customizable",
"items": {
"$ref": "#/definitions/io.argoproj.workflow.v1alpha1.SyncSelector"
},
"type": "array"
}
},
"type": "object"
Expand Down Expand Up @@ -6374,6 +6381,13 @@
"configMapKeyRef": {
"$ref": "#/definitions/io.k8s.api.core.v1.ConfigMapKeySelector",
"description": "ConfigMapKeyRef is configmap selector for Semaphore configuration"
},
"selectors": {
"description": "Selectors is a list of references to dynamic values (like parameters, labels, annotations) that can be added to semaphore key to make concurrency more customizable",
"items": {
"$ref": "#/definitions/io.argoproj.workflow.v1alpha1.SyncSelector"
},
"type": "array"
}
},
"type": "object"
Expand Down Expand Up @@ -6506,6 +6520,20 @@
},
"type": "object"
},
"io.argoproj.workflow.v1alpha1.SyncSelector": {
"description": "Synchronization selector",
"properties": {
"name": {
"description": "Name of the selector",
"type": "string"
},
"template": {
"description": "Template replaced with global variables",
"type": "string"
}
},
"type": "object"
},
"io.argoproj.workflow.v1alpha1.Synchronization": {
"description": "Synchronization holds synchronization lock configuration",
"properties": {
Expand Down
28 changes: 28 additions & 0 deletions api/openapi-spec/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9738,6 +9738,13 @@
"name": {
"description": "name of the mutex",
"type": "string"
},
"selectors": {
"description": "Selectors is a list of references to dynamic values (like parameters, labels, annotations) that can be added to mutex key to make concurrency more customizable",
"type": "array",
"items": {
"$ref": "#/definitions/io.argoproj.workflow.v1alpha1.SyncSelector"
}
}
}
},
Expand Down Expand Up @@ -10520,6 +10527,13 @@
"configMapKeyRef": {
"description": "ConfigMapKeyRef is configmap selector for Semaphore configuration",
"$ref": "#/definitions/io.k8s.api.core.v1.ConfigMapKeySelector"
},
"selectors": {
"description": "Selectors is a list of references to dynamic values (like parameters, labels, annotations) that can be added to semaphore key to make concurrency more customizable",
"type": "array",
"items": {
"$ref": "#/definitions/io.argoproj.workflow.v1alpha1.SyncSelector"
}
}
}
},
Expand Down Expand Up @@ -10651,6 +10665,20 @@
}
}
},
"io.argoproj.workflow.v1alpha1.SyncSelector": {
"description": "Synchronization selector",
"type": "object",
"properties": {
"name": {
"description": "Name of the selector",
"type": "string"
},
"template": {
"description": "Template replaced with global variables",
"type": "string"
}
}
},
"io.argoproj.workflow.v1alpha1.Synchronization": {
"description": "Synchronization holds synchronization lock configuration",
"type": "object",
Expand Down
19 changes: 19 additions & 0 deletions docs/fields.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2626,6 +2626,7 @@ Mutex holds Mutex configuration
| Field Name | Field Type | Description |
|:----------:|:----------:|---------------|
|`name`|`string`|name of the mutex|
|`selectors`|`Array<`[`SyncSelector`](#syncselector)`>`|Selectors is a list of references to dynamic values (like parameters, labels, annotations) that can be added to mutex key to make concurrency more customizable|

## SemaphoreRef

Expand All @@ -2644,6 +2645,7 @@ SemaphoreRef is a reference of Semaphore
| Field Name | Field Type | Description |
|:----------:|:----------:|---------------|
|`configMapKeyRef`|[`ConfigMapKeySelector`](#configmapkeyselector)|ConfigMapKeyRef is configmap selector for Semaphore configuration|
|`selectors`|`Array<`[`SyncSelector`](#syncselector)`>`|Selectors is a list of references to dynamic values (like parameters, labels, annotations) that can be added to semaphore key to make concurrency more customizable|

## ArtifactLocation

Expand Down Expand Up @@ -3964,6 +3966,23 @@ MetricLabel is a single label for a prometheus metric

RetryNodeAntiAffinity is a placeholder for future expansion, only empty nodeAntiAffinity is allowed. In order to prevent running steps on the same host, it uses "kubernetes.io/hostname".

## SyncSelector

Synchronization selector

<details>
<summary>Examples with this field (click to open)</summary>
<br>

- [`input-artifact-git.yaml`](https://github.com/argoproj/argo-workflows/blob/master/examples/input-artifact-git.yaml)
</details>

### Fields
| Field Name | Field Type | Description |
|:----------:|:----------:|---------------|
|`name`|`string`|Name of the selector|
|`template`|`string`|Template replaced with global variables|

## ContainerNode

_No description available_
Expand Down
54 changes: 54 additions & 0 deletions manifests/base/crds/full/argoproj.io_clusterworkflowtemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1088,6 +1088,15 @@ spec:
properties:
name:
type: string
selectors:
items:
properties:
name:
type: string
template:
type: string
type: object
type: array
type: object
semaphore:
properties:
Expand All @@ -1102,6 +1111,15 @@ spec:
required:
- key
type: object
selectors:
items:
properties:
name:
type: string
template:
type: string
type: object
type: array
type: object
type: object
templateDefaults:
Expand Down Expand Up @@ -6850,6 +6868,15 @@ spec:
properties:
name:
type: string
selectors:
items:
properties:
name:
type: string
template:
type: string
type: object
type: array
type: object
semaphore:
properties:
Expand All @@ -6864,6 +6891,15 @@ spec:
required:
- key
type: object
selectors:
items:
properties:
name:
type: string
template:
type: string
type: object
type: array
type: object
type: object
timeout:
Expand Down Expand Up @@ -13300,6 +13336,15 @@ spec:
properties:
name:
type: string
selectors:
items:
properties:
name:
type: string
template:
type: string
type: object
type: array
type: object
semaphore:
properties:
Expand All @@ -13314,6 +13359,15 @@ spec:
required:
- key
type: object
selectors:
items:
properties:
name:
type: string
template:
type: string
type: object
type: array
type: object
type: object
timeout:
Expand Down
54 changes: 54 additions & 0 deletions manifests/base/crds/full/argoproj.io_cronworkflows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,6 +1109,15 @@ spec:
properties:
name:
type: string
selectors:
items:
properties:
name:
type: string
template:
type: string
type: object
type: array
type: object
semaphore:
properties:
Expand All @@ -1123,6 +1132,15 @@ spec:
required:
- key
type: object
selectors:
items:
properties:
name:
type: string
template:
type: string
type: object
type: array
type: object
type: object
templateDefaults:
Expand Down Expand Up @@ -6871,6 +6889,15 @@ spec:
properties:
name:
type: string
selectors:
items:
properties:
name:
type: string
template:
type: string
type: object
type: array
type: object
semaphore:
properties:
Expand All @@ -6885,6 +6912,15 @@ spec:
required:
- key
type: object
selectors:
items:
properties:
name:
type: string
template:
type: string
type: object
type: array
type: object
type: object
timeout:
Expand Down Expand Up @@ -13321,6 +13357,15 @@ spec:
properties:
name:
type: string
selectors:
items:
properties:
name:
type: string
template:
type: string
type: object
type: array
type: object
semaphore:
properties:
Expand All @@ -13335,6 +13380,15 @@ spec:
required:
- key
type: object
selectors:
items:
properties:
name:
type: string
template:
type: string
type: object
type: array
type: object
type: object
timeout:
Expand Down
Loading