From 0384f3e193ee082ef9d77356884f874239f2accd Mon Sep 17 00:00:00 2001 From: Tommy Li Date: Tue, 6 Aug 2019 15:40:19 -0700 Subject: [PATCH 1/3] add containerRuntimeExecutor option for other argo executors --- argo/base/config-map.yaml | 1 + argo/base/kustomization.yaml | 7 +++++++ argo/base/params.env | 1 + 3 files changed, 9 insertions(+) diff --git a/argo/base/config-map.yaml b/argo/base/config-map.yaml index e5fb4d3501..384473d759 100644 --- a/argo/base/config-map.yaml +++ b/argo/base/config-map.yaml @@ -7,6 +7,7 @@ data: config: | { executorImage: $(executorImage), + containerRuntimeExecutor: $(containerRuntimeExecutor), artifactRepository: { s3: { diff --git a/argo/base/kustomization.yaml b/argo/base/kustomization.yaml index f0a42709d6..508a422593 100644 --- a/argo/base/kustomization.yaml +++ b/argo/base/kustomization.yaml @@ -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 diff --git a/argo/base/params.env b/argo/base/params.env index bccdfef897..2bb20197ba 100644 --- a/argo/base/params.env +++ b/argo/base/params.env @@ -1,5 +1,6 @@ namespace= executorImage=argoproj/argoexec:v2.3.0 +containerRuntimeExecutor=docker artifactRepositoryBucket=mlpipeline artifactRepositoryKeyPrefix=artifacts artifactRepositoryEndpoint=minio-service.kubeflow:9000 From aee9430532b134e07fe8d8d84b0c34ec7bb18088 Mon Sep 17 00:00:00 2001 From: Tommy Li Date: Wed, 7 Aug 2019 09:14:13 -0700 Subject: [PATCH 2/3] Update argo base tests for the corresponding changes --- tests/argo-base_test.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/argo-base_test.go b/tests/argo-base_test.go index 7b4fa87392..b1ee0bdf83 100644 --- a/tests/argo-base_test.go +++ b/tests/argo-base_test.go @@ -132,6 +132,7 @@ data: config: | { executorImage: $(executorImage), + containerRuntimeExecutor: $(containerRuntimeExecutor), artifactRepository: { s3: { @@ -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 @@ -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 From 2aba3d7e16f06fa8c8e2d754ca0d23b436ab1c52 Mon Sep 17 00:00:00 2001 From: Tommy Li Date: Wed, 7 Aug 2019 09:33:29 -0700 Subject: [PATCH 3/3] Update argo overlay istio test with the corresponding changes --- tests/argo-overlays-istio_test.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/argo-overlays-istio_test.go b/tests/argo-overlays-istio_test.go index 05ca9c034e..88f6a2576a 100644 --- a/tests/argo-overlays-istio_test.go +++ b/tests/argo-overlays-istio_test.go @@ -169,6 +169,7 @@ data: config: | { executorImage: $(executorImage), + containerRuntimeExecutor: $(containerRuntimeExecutor), artifactRepository: { s3: { @@ -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 @@ -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