openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rab...@apache.org
Subject [incubator-openwhisk-deploy-kube] branch master updated: Fix hostpath for /containers mount for dind cluster (#329)
Date Thu, 01 Nov 2018 21:10:17 GMT
This is an automated email from the ASF dual-hosted git repository.

rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git


The following commit(s) were added to refs/heads/master by this push:
     new 355dc04  Fix hostpath for /containers mount for dind cluster (#329)
355dc04 is described below

commit 355dc04fc80808b7e81bff8c9ba95c9964d9b07b
Author: David Grove <dgrove-oss@users.noreply.github.com>
AuthorDate: Thu Nov 1 17:10:12 2018 -0400

    Fix hostpath for /containers mount for dind cluster (#329)
---
 helm/openwhisk/templates/_invokerHelpers.tpl | 4 ++++
 helm/openwhisk/values.yaml                   | 1 +
 tools/travis/build-helm.sh                   | 1 +
 3 files changed, 6 insertions(+)

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:


Mime
View raw message