Merge pull request #57 from 0x0I/add_sidecar_support

add dind.enable easy-button and 'podContainers' param to allow specification of agent side-cars
buildkite · May 11, 2020 · eecee73 · eecee73
2 parents 3a07b8c + b90b198
commit eecee73
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/stable/agent/Chart.yaml b/stable/agent/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Buildkite Agent Chart
 name: agent
-version: 0.3.12
+version: 0.3.13
 appVersion: 3.17.0
 icon: https://raw.githubusercontent.com/buildkite/site/master/assets/images/brand-assets/buildkite-mark-on-light.png
 keywords:

diff --git a/stable/agent/README.md b/stable/agent/README.md
@@ -83,6 +83,10 @@ Parameter | Description | Default
 `tolerations` | Node tolerations for pod assignment | `{}`
 `affinity` | Node/pod affinity | `{}`
 `podAnnotations` | Extra annotation to apply to the pod | `{}`
+`podContainers` | Extra pod container or sidecar configuration | `nil`
+`dind.enabled` | Enable preconfigured Docker-in-Docker (DinD) pod configuration | `false`
+`dind.image` | Image to use for Docker-in-Docker (DinD) pod | `docker:19.03-dind`
+`dind.port` | Port Docker-in-Docker (DinD) daemon listens on as REST request proxy | `2375`
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
 

diff --git a/stable/agent/templates/deployment.yaml b/stable/agent/templates/deployment.yaml
@@ -10,6 +10,9 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "name" . }}
   template:
     metadata:
       labels:
@@ -59,6 +62,10 @@ spec:
                   name: {{ template "fullname" . }}
                   key: agent-ssh
             {{- end }}
+            {{- if .Values.dind.enabled }}
+            - name: DOCKER_HOST
+              value: "tcp://localhost:{{ .Values.dind.port | default "2375" }}"
+            {{- end }}
             # EXTRA BUILDKITE AGENT ENV VARS
 {{- if .Values.extraEnv }}
 {{ toYaml .Values.extraEnv | nindent 12 }}
@@ -81,6 +88,25 @@ spec:
             - name: docker-config
               mountPath: /root/.docker
             {{- end }}
+            {{- if .Values.dind.enabled }}
+            - name: shared-volume
+              mountPath: "/var/buildkite"
+            {{- end }}
+{{- if .Values.dind.enabled }}
+        - name: dind
+          image: {{ .Values.dind.image | default "docker:19.03-dind" }}
+          securityContext:
+            privileged: true
+          env:
+          - name: DOCKER_TLS_CERTDIR
+            value: ""
+          volumeMounts:
+          - name: "docker-graph-storage"
+            mountPath: "/var/lib/docker"
+          - name: shared-volume
+            mountPath: "/var/buildkite"
+{{- end }}
+{{- if .Values.podContainers }}{{ toYaml .Values.podContainers | nindent 8 }}{{- end }}
       volumes:
 {{- if .Values.volumes }}{{ toYaml .Values.volumes | nindent 8 }}{{- end }}
 {{- if .Values.enableHostDocker }}
@@ -98,6 +124,12 @@ spec:
           secret:
             secretName: {{ template "fullname" . }}-registry
         {{- end }}
+        {{- if .Values.dind.enabled }}
+        - name: docker-graph-storage
+          emptyDir: {}
+        - name: shared-volume
+          emptyDir: {}
+        {{- end }}
     {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}