[GitHub] rabbah closed pull request #329: Fix hostpath for /containers mount for dind cluster

[GitBox <gi...@apache.org>]

rabbah closed pull request #329: Fix hostpath for /containers mount for dind cluster
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/329
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/helm/openwhisk/templates/_invokerHelpers.tpl b/helm/openwhisk/templates/_invokerHelpers.tpl
index 216a440..cca7f7f 100644
--- a/helm/openwhisk/templates/_invokerHelpers.tpl
+++ b/helm/openwhisk/templates/_invokerHelpers.tpl
@@ -10,7 +10,11 @@
     path: "/run/runc"
 - name: dockerrootdir
   hostPath:
+    {{- if .Values.invoker.containerFactory.dind }}
+    path: "/dind/docker/containers"
+    {{- else }}
     path: "/var/lib/docker/containers"
+    {{- end }}
 - name: dockersock
   hostPath:
     path: "/var/run/docker.sock"
diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml
index 34cb6e1..43e17c0 100644
--- a/helm/openwhisk/values.yaml
+++ b/helm/openwhisk/values.yaml
@@ -173,6 +173,7 @@ invoker:
   jvmHeapMB: "512"
   jvmOptions: ""
   containerFactory:
+    dind: false
     useRunc: false
     impl: "docker"
     kubernetes:
diff --git a/tools/travis/build-helm.sh b/tools/travis/build-helm.sh
index 0ab4c0e..ad752e2 100755
--- a/tools/travis/build-helm.sh
+++ b/tools/travis/build-helm.sh
@@ -213,6 +213,7 @@ whisk:
 
 invoker:
   containerFactory:
+    dind: true
     impl: $OW_CONTAINER_FACTORY
     kubernetes:
       agent:


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services