improvement(k8s): update in-cluster docker to 19.03.4

This fixes a number of issues relating to BuildKit support, among other things.
garden-io · Nov 13, 2019 · a4fb418 · a4fb418
1 parent c1886f5
commit a4fb418
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 6 deletions.
diff --git a/docs/reference/providers/kubernetes.md b/docs/reference/providers/kubernetes.md
@@ -59,6 +59,26 @@ this is less secure than Kaniko, but in turn it is generally faster. See the
 | -------- | -------- | ---------------- |
 | `string` | No       | `"local-docker"` |
 
+### `providers[].clusterDocker`
+
+[providers](#providers) > clusterDocker
+
+Configuration options for the `cluster-docker` build mode.
+
+| Type     | Required | Default |
+| -------- | -------- | ------- |
+| `object` | No       | `"{}"`  |
+
+### `providers[].clusterDocker.enableBuildKit`
+
+[providers](#providers) > [clusterDocker](#providersclusterdocker) > enableBuildKit
+
+Enable [BuildKit](https://github.com/moby/buildkit) support. This should in most cases work well and be more performant, but we're opting to keep it optional until it's enabled by default in Docker.
+
+| Type      | Required | Default |
+| --------- | -------- | ------- |
+| `boolean` | No       | `false` |
+
 ### `providers[].defaultHostname`
 
 [providers](#providers) > defaultHostname
@@ -1116,6 +1136,8 @@ The values in the schema below are the default values.
 providers:
   - environments:
     buildMode: local-docker
+    clusterDocker:
+      enableBuildKit: false
     defaultHostname:
     defaultUsername:
     deploymentStrategy: rolling

diff --git a/docs/reference/providers/local-kubernetes.md b/docs/reference/providers/local-kubernetes.md
@@ -59,6 +59,26 @@ this is less secure than Kaniko, but in turn it is generally faster. See the
 | -------- | -------- | ---------------- |
 | `string` | No       | `"local-docker"` |
 
+### `providers[].clusterDocker`
+
+[providers](#providers) > clusterDocker
+
+Configuration options for the `cluster-docker` build mode.
+
+| Type     | Required | Default |
+| -------- | -------- | ------- |
+| `object` | No       | `"{}"`  |
+
+### `providers[].clusterDocker.enableBuildKit`
+
+[providers](#providers) > [clusterDocker](#providersclusterdocker) > enableBuildKit
+
+Enable [BuildKit](https://github.com/moby/buildkit) support. This should in most cases work well and be more performant, but we're opting to keep it optional until it's enabled by default in Docker.
+
+| Type      | Required | Default |
+| --------- | -------- | ------- |
+| `boolean` | No       | `false` |
+
 ### `providers[].defaultHostname`
 
 [providers](#providers) > defaultHostname
@@ -1017,6 +1037,8 @@ The values in the schema below are the default values.
 providers:
   - environments:
     buildMode: local-docker
+    clusterDocker:
+      enableBuildKit: false
     defaultHostname:
     defaultUsername:
     deploymentStrategy: rolling

diff --git a/garden-service/static/kubernetes/system/docker-daemon/templates/deployment.yaml b/garden-service/static/kubernetes/system/docker-daemon/templates/deployment.yaml
@@ -41,16 +41,20 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: docker
-              containerPort: 2375
+              containerPort: 2376
               protocol: TCP
           securityContext:
             privileged: true
-          livenessProbe:
-            tcpSocket:
-              port: 2375
           readinessProbe:
             tcpSocket:
-              port: 2375
+              port: 2376
+            initialDelaySeconds: 10
+            periodSeconds: 2
+          livenessProbe:
+            tcpSocket:
+              port: 2376
+            initialDelaySeconds: 20
+            periodSeconds: 20
           volumeMounts:
             - name: garden-docker-data
               mountPath: /var/lib/docker

diff --git a/garden-service/static/kubernetes/system/docker-daemon/values.yaml b/garden-service/static/kubernetes/system/docker-daemon/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   repository: docker
-  tag: 18.09.3-dind
+  tag: 19.03.4-dind
   pullPolicy: IfNotPresent
 
 nameOverride: "garden-docker-daemon"