From 2846e3730db4cb2627b98a121249830db8853c07 Mon Sep 17 00:00:00 2001
From: Weiqiang Zhuang <wzhuang@us.ibm.com>
Date: Mon, 21 Oct 2019 11:31:15 -0700
Subject: [PATCH] add dockerSockPath to argo config map

---
 argo/base/config-map.yaml               | 1 +
 argo/base/kustomization.yaml            | 7 +++++++
 argo/base/params.env                    | 1 +
 tests/argo-base_test.go                 | 9 +++++++++
 tests/argo-overlays-application_test.go | 9 +++++++++
 tests/argo-overlays-istio_test.go       | 9 +++++++++
 6 files changed, 36 insertions(+)

diff --git a/argo/base/config-map.yaml b/argo/base/config-map.yaml
index 384473d759..3bd101c4ac 100644
--- 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
index 481dad107f..9327e27d93 100644
--- 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
index 2bb20197ba..1efc4c848a 100644
--- 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
index 017f593679..ffa5ac5708 100644
--- 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
index f84fe6da54..a201048678 100644
--- 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
index 4452155ef8..a4697baa97 100644
--- 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