add dockerSockPath to argo config map

kubeflow · Oct 21, 2019 · 2846e37 · 2846e37
1 parent 4d2939d
commit 2846e37
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 0 deletions.
diff --git a/argo/base/config-map.yaml b/argo/base/config-map.yaml
@@ -8,6 +8,7 @@ data:
     {
     executorImage: $(executorImage),
     containerRuntimeExecutor: $(containerRuntimeExecutor),
+    dockerSockPath: $(dockerSockPath),
     artifactRepository:
     {
         s3: {

diff --git a/argo/base/kustomization.yaml b/argo/base/kustomization.yaml
@@ -37,6 +37,13 @@ vars:
     apiVersion: v1
   fieldref:
     fieldpath: data.containerRuntimeExecutor
+- name: dockerSockPath
+  objref:
+    kind: ConfigMap
+    name: workflow-controller-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.dockerSockPath
 - name: artifactRepositoryBucket
   objref:
     kind: ConfigMap

diff --git a/argo/base/params.env b/argo/base/params.env
@@ -1,6 +1,7 @@
 namespace=
 executorImage=argoproj/argoexec:v2.3.0
 containerRuntimeExecutor=docker
+dockerSockPath=/var/run/docker.sock
 artifactRepositoryBucket=mlpipeline
 artifactRepositoryKeyPrefix=artifacts
 artifactRepositoryEndpoint=minio-service.kubeflow:9000

diff --git a/tests/argo-base_test.go b/tests/argo-base_test.go
@@ -135,6 +135,7 @@ data:
     {
     executorImage: $(executorImage),
     containerRuntimeExecutor: $(containerRuntimeExecutor),
+    dockerSockPath: $(dockerSockPath),
     artifactRepository:
     {
         s3: {
@@ -329,6 +330,7 @@ varReference:
 namespace=
 executorImage=argoproj/argoexec:v2.3.0
 containerRuntimeExecutor=docker
+dockerSockPath=/var/run/docker.sock
 artifactRepositoryBucket=mlpipeline
 artifactRepositoryKeyPrefix=artifacts
 artifactRepositoryEndpoint=minio-service.kubeflow:9000
@@ -379,6 +381,13 @@ vars:
     apiVersion: v1
   fieldref:
     fieldpath: data.containerRuntimeExecutor
+- name: dockerSockPath
+  objref:
+    kind: ConfigMap
+    name: workflow-controller-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.dockerSockPath
 - name: artifactRepositoryBucket
   objref:
     kind: ConfigMap

diff --git a/tests/argo-overlays-application_test.go b/tests/argo-overlays-application_test.go
@@ -190,6 +190,7 @@ data:
     {
     executorImage: $(executorImage),
     containerRuntimeExecutor: $(containerRuntimeExecutor),
+    dockerSockPath: $(dockerSockPath),
     artifactRepository:
     {
         s3: {
@@ -384,6 +385,7 @@ varReference:
 namespace=
 executorImage=argoproj/argoexec:v2.3.0
 containerRuntimeExecutor=docker
+dockerSockPath=/var/run/docker.sock
 artifactRepositoryBucket=mlpipeline
 artifactRepositoryKeyPrefix=artifacts
 artifactRepositoryEndpoint=minio-service.kubeflow:9000
@@ -434,6 +436,13 @@ vars:
     apiVersion: v1
   fieldref:
     fieldpath: data.containerRuntimeExecutor
+- name: dockerSockPath
+  objref:
+    kind: ConfigMap
+    name: workflow-controller-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.dockerSockPath
 - name: artifactRepositoryBucket
   objref:
     kind: ConfigMap

diff --git a/tests/argo-overlays-istio_test.go b/tests/argo-overlays-istio_test.go
@@ -172,6 +172,7 @@ data:
     {
     executorImage: $(executorImage),
     containerRuntimeExecutor: $(containerRuntimeExecutor),
+    dockerSockPath: $(dockerSockPath),
     artifactRepository:
     {
         s3: {
@@ -366,6 +367,7 @@ varReference:
 namespace=
 executorImage=argoproj/argoexec:v2.3.0
 containerRuntimeExecutor=docker
+dockerSockPath=/var/run/docker.sock
 artifactRepositoryBucket=mlpipeline
 artifactRepositoryKeyPrefix=artifacts
 artifactRepositoryEndpoint=minio-service.kubeflow:9000
@@ -416,6 +418,13 @@ vars:
     apiVersion: v1
   fieldref:
     fieldpath: data.containerRuntimeExecutor
+- name: dockerSockPath
+  objref:
+    kind: ConfigMap
+    name: workflow-controller-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.dockerSockPath
 - name: artifactRepositoryBucket
   objref:
     kind: ConfigMap