Skip to content
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.

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

Add containerRuntimeExecutor field for other argo executors #259

Merged
merged 3 commits into from
Aug 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions argo/base/config-map.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ data:
config: |
{
executorImage: $(executorImage),
containerRuntimeExecutor: $(containerRuntimeExecutor),
artifactRepository:
{
s3: {
Expand Down
7 changes: 7 additions & 0 deletions argo/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ vars:
apiVersion: v1
fieldref:
fieldpath: data.executorImage
- name: containerRuntimeExecutor
objref:
kind: ConfigMap
name: workflow-controller-parameters
apiVersion: v1
fieldref:
fieldpath: data.containerRuntimeExecutor
- name: artifactRepositoryBucket
objref:
kind: ConfigMap
Expand Down
1 change: 1 addition & 0 deletions argo/base/params.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
namespace=
executorImage=argoproj/argoexec:v2.3.0
containerRuntimeExecutor=docker
artifactRepositoryBucket=mlpipeline
artifactRepositoryKeyPrefix=artifacts
artifactRepositoryEndpoint=minio-service.kubeflow:9000
Expand Down
9 changes: 9 additions & 0 deletions tests/argo-base_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ data:
config: |
{
executorImage: $(executorImage),
containerRuntimeExecutor: $(containerRuntimeExecutor),
artifactRepository:
{
s3: {
Expand Down Expand Up @@ -325,6 +326,7 @@ varReference:
th.writeF("/manifests/argo/base/params.env", `
namespace=
executorImage=argoproj/argoexec:v2.3.0
containerRuntimeExecutor=docker
artifactRepositoryBucket=mlpipeline
artifactRepositoryKeyPrefix=artifacts
artifactRepositoryEndpoint=minio-service.kubeflow:9000
Expand Down Expand Up @@ -368,6 +370,13 @@ vars:
apiVersion: v1
fieldref:
fieldpath: data.executorImage
- name: containerRuntimeExecutor
objref:
kind: ConfigMap
name: workflow-controller-parameters
apiVersion: v1
fieldref:
fieldpath: data.containerRuntimeExecutor
- name: artifactRepositoryBucket
objref:
kind: ConfigMap
Expand Down
9 changes: 9 additions & 0 deletions tests/argo-overlays-istio_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ data:
config: |
{
executorImage: $(executorImage),
containerRuntimeExecutor: $(containerRuntimeExecutor),
artifactRepository:
{
s3: {
Expand Down Expand Up @@ -362,6 +363,7 @@ varReference:
th.writeF("/manifests/argo/base/params.env", `
namespace=
executorImage=argoproj/argoexec:v2.3.0
containerRuntimeExecutor=docker
artifactRepositoryBucket=mlpipeline
artifactRepositoryKeyPrefix=artifacts
artifactRepositoryEndpoint=minio-service.kubeflow:9000
Expand Down Expand Up @@ -405,6 +407,13 @@ vars:
apiVersion: v1
fieldref:
fieldpath: data.executorImage
- name: containerRuntimeExecutor
objref:
kind: ConfigMap
name: workflow-controller-parameters
apiVersion: v1
fieldref:
fieldpath: data.containerRuntimeExecutor
- name: artifactRepositoryBucket
objref:
kind: ConfigMap
Expand Down