Support initContainers and arbitrary volumes (#19)

* Support initContainers and arbitrary volumes Signed-off-by: David Young <davidy@funkypenguin.co.nz> * Bump Chart.yaml version for this PR Signed-off-by: David Young <davidy@funkypenguin.co.nz> Signed-off-by: David Young <davidy@funkypenguin.co.nz> Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
grafana · Sep 2, 2022 · 2f411f4 · 2f411f4
1 parent 72ff806
commit 2f411f4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/charts/k6-loadtester/Chart.yaml b/charts/k6-loadtester/Chart.yaml
@@ -10,4 +10,11 @@ keywords:
   - flagger
   - canary
   - webhook
-  - k6
+  - k6
+home: https://github.com/grafana/flagger-k6-webhook
+maintainers:
+  - name: julienduchesne
+annotations:
+  artifacthub.io/changes: |-
+    - kind: updated
+      description: Support initContainers and arbitrary volumes
diff --git a/charts/k6-loadtester/templates/deployment.yaml b/charts/k6-loadtester/templates/deployment.yaml
@@ -24,6 +24,10 @@ spec:
       {{- end }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      volumes:
+        {{- toYaml .Values.volumes | nindent 8 }}        
+      initContainers:
+{{ toYaml .Values.initContainers | nindent 8 }} 
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
@@ -47,7 +51,9 @@ spec:
                 secretKeyRef:
                   name: {{ $.Values.webhook.name }}
                   key: {{ $k | quote }}
-            {{- end }}                        
+            {{- end }}                       
+          volumeMounts:
+            {{- toYaml .Values.volumeMounts | nindent 12 }}             
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/k6-loadtester/values.yaml b/charts/k6-loadtester/values.yaml
@@ -63,4 +63,15 @@ webhook:
   # A list of configurable variables
   vars:
     "K6_CLOUD_TOKEN" : ""
-    "SLACK_TOKEN" : ""
+    "SLACK_TOKEN" : ""
+
+# Additional volumes Deployment (can be used with initContainers, below)
+volumes: []
+
+## InitContainers allows injecting additional initContainers. This can be used in combination
+## with volumes (above) and volumeMounts (below) to import test assets from configmaps, or
+## additional container images
+initContainers: []
+
+# Additional VolumeMounts on the Deployment
+volumeMounts: []