Make test pod metadata and spec configurable (#727)

* Make test pod metadata and spec configurable * Add docs --------- Co-authored-by: Yevhen Ivantsov <yivantsov@atlassian.com>
atlassian · Dec 7, 2023 · 098337d · 098337d
1 parent 090ddad
commit 098337d
Show file tree

Hide file tree

Showing 36 changed files with 1,472 additions and 709 deletions.
diff --git a/src/main/charts/bamboo-agent/README.md b/src/main/charts/bamboo-agent/README.md
diff --git a/src/main/charts/bamboo/README.md b/src/main/charts/bamboo/README.md
diff --git a/src/main/charts/bamboo/templates/tests/test-application-status.yaml b/src/main/charts/bamboo/templates/tests/test-application-status.yaml
@@ -5,9 +5,21 @@ metadata:
   annotations:
     "helm.sh/hook": test
     "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
+    {{- if not .Values.testPods.annotations }}
     {{- include "bamboo.podAnnotations" . | nindent 4 }}
+    {{- else }}
+    {{- range $key, $value := .Values.testPods.annotations }}
+    {{ $key | quote }}: {{ tpl $value $ | quote }}
+    {{- end }}
+    {{- end }}
   labels:
+    {{- if not .Values.testPods.labels }}
     {{- include "common.labels.commonLabels" . | nindent 4 }}
+    {{- else }}
+    {{- range $key, $value := .Values.testPods.labels }}
+    {{ $key | quote }}: {{ tpl $value $ | quote }}
+    {{- end }}
+    {{- end }}
 spec:
   containers:
     - name: test
@@ -36,4 +48,19 @@ spec:
             sleep 10
             count=$(( $count + 1 ))
           done
-  restartPolicy: Never
+  restartPolicy: Never
+  {{- with .Values.testPods.nodeSelector }}
+  nodeSelector:
+  {{- toYaml . | nindent 8 }}
+  {{- end }}
+  {{- with .Values.testPods.affinity }}
+  affinity:
+  {{- toYaml . | nindent 8 }}
+  {{- end }}
+  {{- with .Values.testPods.tolerations }}
+  tolerations:
+  {{- toYaml . | nindent 8 }}
+  {{- end }}
+  {{- if .Values.testPods.schedulerName }}
+  schedulerName: {{ .Values.testPods.schedulerName  | quote }}
+  {{- end }}
diff --git a/src/main/charts/bamboo/templates/tests/test-database-connectivity.yaml b/src/main/charts/bamboo/templates/tests/test-database-connectivity.yaml
@@ -6,9 +6,21 @@ metadata:
   annotations:
     "helm.sh/hook": test
     "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
+    {{- if not .Values.testPods.annotations }}
     {{- include "bamboo.podAnnotations" . | nindent 4 }}
+    {{- else }}
+    {{- range $key, $value := .Values.testPods.annotations }}
+    {{ $key | quote }}: {{ tpl $value $ | quote }}
+    {{- end }}
+    {{- end }}
   labels:
+    {{- if not .Values.testPods.labels }}
     {{- include "common.labels.commonLabels" . | nindent 4 }}
+    {{- else }}
+    {{- range $key, $value := .Values.testPods.labels }}
+    {{ $key | quote }}: {{ tpl $value $ | quote }}
+    {{- end }}
+    {{- end }}
 spec:
   serviceAccountName: {{ include "bamboo.serviceAccountName" . }}
   containers:
@@ -49,4 +61,19 @@ spec:
           cat output.txt
           grep -q "Connection established OK" output.txt
   restartPolicy: Never
-{{ end }}
+  {{- with .Values.testPods.nodeSelector }}
+  nodeSelector:
+  {{- toYaml . | nindent 8 }}
+  {{- end }}
+  {{- with .Values.testPods.affinity }}
+  affinity:
+  {{- toYaml . | nindent 8 }}
+  {{- end }}
+  {{- with .Values.testPods.tolerations }}
+  tolerations:
+  {{- toYaml . | nindent 8 }}
+  {{- end }}
+  {{- if .Values.testPods.schedulerName }}
+  schedulerName: {{ .Values.testPods.schedulerName  | quote }}
+  {{- end }}
+{{ end }}
diff --git a/src/main/charts/bamboo/templates/tests/test-shared-home-permissions.yaml b/src/main/charts/bamboo/templates/tests/test-shared-home-permissions.yaml
@@ -5,9 +5,21 @@ metadata:
   annotations:
     "helm.sh/hook": test
     "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
+    {{- if not .Values.testPods.annotations }}
     {{- include "bamboo.podAnnotations" . | nindent 4 }}
+    {{- else }}
+    {{- range $key, $value := .Values.testPods.annotations }}
+    {{ $key | quote }}: {{ tpl $value $ | quote }}
+    {{- end }}
+    {{- end }}
   labels:
+    {{- if not .Values.testPods.labels }}
     {{- include "common.labels.commonLabels" . | nindent 4 }}
+    {{- else }}
+    {{- range $key, $value := .Values.testPods.labels }}
+    {{ $key | quote }}: {{ tpl $value $ | quote }}
+    {{- end }}
+    {{- end }}
 spec:
   containers:
     - name: test
@@ -41,4 +53,19 @@ spec:
           rm /shared-home/permissions-test
   volumes:
     {{ include "bamboo.volumes.sharedHome" . | nindent 4 }}
-  restartPolicy: Never
+  restartPolicy: Never
+  {{- with .Values.testPods.nodeSelector }}
+  nodeSelector:
+  {{- toYaml . | nindent 8 }}
+  {{- end }}
+  {{- with .Values.testPods.affinity }}
+  affinity:
+  {{- toYaml . | nindent 8 }}
+  {{- end }}
+  {{- with .Values.testPods.tolerations }}
+  tolerations:
+  {{- toYaml . | nindent 8 }}
+  {{- end }}
+  {{- if .Values.testPods.schedulerName }}
+  schedulerName: {{ .Values.testPods.schedulerName  | quote }}
+  {{- end }}
diff --git a/src/main/charts/bamboo/values.yaml b/src/main/charts/bamboo/values.yaml
@@ -1146,7 +1146,7 @@ additionalConfigMaps: []
 atlassianAnalyticsAndSupport:
 
   analytics:
-    
+
     # -- Mount ConfigMap with selected Helm chart values as a JSON
     # which DC products will read and send analytics events to Atlassian data pipelines
     #
@@ -1158,3 +1158,16 @@ atlassianAnalyticsAndSupport:
     # which can be optionally including to support.zip
     #
     enabled: true
+
+# -- Metadata and pod spec for pods started in Helm tests
+#
+testPods:
+  labels: {}
+  annotations: {}
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
+  schedulerName:
+  image:
+    permissionsTestContainer: debian:stable-slim
+    statusTestContainer: alpine:latest