Assorted improvements

.travis.yml

@@ -22,5 +22,5 @@ before_script:
     done
 
 script:
-- helm lint .
-- helm template .
+- helm lint charts/vsts-agent
+- helm template charts/vsts-agent

Makefile

@@ -0,0 +1,5 @@
+.PHONY: helm-package
+
+helm-package:
+	helm package charts/vsts-agent -d charts
+	helm repo index --merge charts/index.yaml charts

README.md

@@ -25,6 +25,11 @@ The following tables lists the configurable parameters of the `vsts-agent` chart
 | `vstsPool`                        | VSTS agent pool name                  | `kubernetes-vsts-agents`                                  |
 | `vstsAgentName`                   | VSTS agent name                       | `$HOSTNAME`                                               |
 | `vstsWorkspace`                   | VSTS agent workspace                  | `/workspace`                                              |
+| `extraEnv`                   | Extra environment variables on the vsts-agent container                  | `nil`                                              |
+| `cleanRun`                   | Kill and restart vsts-agent container on completion of a build (completely resets the environment)                  | `false`                                              |
+| `volumes`                   | An array of custom volumes to attach to the vsts-agent pod                  | `docker-socket` to mount /var/run/docker.sock (if you still need this volume when defining addition ones, please ensure you reference it again in your list)                                             |
+| `volumeMounts`                   | volumeMounts to the vsts-agent container as referenced in `volumes`                  | A read-only `docker-socket` to mount as /var/run/docker.sock in vsts-agent container (as in `volumes` please reference this again if you still need it in your custom list)                                               |
+| `extraContainers`                   | Array of additional sidecar containers to add into the vsts-agent pod                  | `nil`                                              |
 
 ## Configure your VSTS instance
 

charts/index.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+entries:
+  vsts-agent:
+  - apiVersion: v1
+    created: 2018-10-05T16:06:09.742522+01:00
+    description: Helm chart for Visual Studio Team Services agent pool
+    digest: c13c24fad551693836f3f36188917230b861eb4ca10f4ba8aee38cf68d55151f
+    maintainers:
+    - email: [email protected]
+      name: Microsoft Social Engagement
+    name: vsts-agent
+    urls:
+    - vsts-agent-1.0.0.tgz
+    version: 1.0.0
+generated: 2018-10-05T16:06:09.741511+01:00

Chart.yaml → charts/vsts-agent/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-name: helm-vsts-agent
+name: vsts-agent
 version: 1.0.0
 description: Helm chart for Visual Studio Team Services agent pool
 maintainers:

templates/vsts-agent.yaml → charts/vsts-agent/templates/vsts-agent.yaml

@@ -36,24 +36,39 @@ spec:
             value: {{ .vstsAgentName | default "$HOSTNAME" }}
           - name: VSTS_WORK
             value: {{ .vstsWorkspace | default "/workspace" }}
-          {{- end }}
+         {{- end }}
+         {{- range $key, $value := .Values.extraEnv }}
+          - name: {{ $key }}
+            value: {{ $value | quote }}
+         {{- end }}
         volumeMounts:
-          - name: docker-socket
-            mountPath: /var/run/docker.sock
-            readOnly: false
           - name: workspace
             mountPath: {{ .Values.vstsWorkspace | default "/workspace" }}
+{{- if .Values.volumeMounts }}
+{{ toYaml .Values.volumeMounts | indent 10 }}
+{{ end }}
         resources:
           limits:
             memory: {{ .Values.resources.limits.memory | quote }}
             cpu: {{ .Values.resources.limits.cpu | quote }}
           requests:
             memory: {{ .Values.resources.requests.memory | quote }}
             cpu: {{ .Values.resources.requests.cpu | quote }}
+     {{- if .Values.cleanRun }}
+        livenessProbe:
+          exec:
+            command:
+            - /bin/sh
+            - -c
+            - "! ls /vsts/agent/_diag | grep Worker || pgrep Agent.Worker"
+          initialDelaySeconds: 120
+          periodSeconds: 5
+     {{- end }}
+{{ if .Values.extraContainers }}
+{{ toYaml .Values.extraContainers | indent 6 }}
+{{ end }}
       volumes:
-        - name: docker-socket
-          hostPath:
-            path: /var/run/docker.sock
+{{ toYaml .Values.volumes | indent 8 }}
 {{ if .Values.image.imagePullSecret }}
       imagePullSecrets:
         - name: {{ .Values.image.imagePullSecret }}

values.yaml → charts/vsts-agent/values.yaml

@@ -14,3 +14,19 @@ resources:
     memory: 8Gi
   disk: "50Gi"
   storageclass: "default"
+
+cleanRun: false
+
+volumeMounts:
+- name: docker-socket
+  mountPath: /var/run/docker.sock
+  readOnly: false
+
+volumes:
+- name: docker-socket
+  hostPath:
+    path: /var/run/docker.sock
+
+extraEnv: {}
+
+extraContainers: []