Updated pod labels for all products (#901)

* Updated pod labels for all products * Fix tests --------- Co-authored-by: Adam Brokes <abrokes@atlassian.com> Co-authored-by: Yevhen Ivantsov <yivantsov@atlassian.com>
atlassian · Nov 7, 2024 · 3c351ef · 3c351ef
1 parent 4cb3cba
commit 3c351ef
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 6 deletions.
diff --git a/src/main/charts/bamboo/templates/statefulset.yaml b/src/main/charts/bamboo/templates/statefulset.yaml
@@ -36,7 +36,7 @@ spec:
         {{- end }}
         {{- include "bamboo.podAnnotations" . | nindent 8 }}
       labels:
-        {{- include "common.labels.selectorLabels" . | nindent 8 }}
+        {{- include "common.labels.commonLabels" . | nindent 8 }}
         {{- include "bamboo.podLabels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ include "bamboo.serviceAccountName" . }}

diff --git a/src/main/charts/bitbucket/templates/statefulset.yaml b/src/main/charts/bitbucket/templates/statefulset.yaml
@@ -40,7 +40,7 @@ spec:
         {{- end }}
         {{- include "bitbucket.podAnnotations" . | nindent 8 }}
       labels:
-        {{- include "common.labels.selectorLabels" . | nindent 8 }}
+        {{- include "common.labels.commonLabels" . | nindent 8 }}
         {{- include "bitbucket.podLabels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ include "bitbucket.serviceAccountName" . }}

diff --git a/src/main/charts/confluence/templates/statefulset-synchrony.yaml b/src/main/charts/confluence/templates/statefulset-synchrony.yaml
@@ -35,7 +35,7 @@ spec:
         {{- include "confluence.podAnnotations" . | nindent 8 }}
         {{- end }}
       labels:
-        {{- include "synchrony.selectorLabels" . | nindent 8 }}
+        {{- include "synchrony.labels" . | nindent 8 }}
         {{- include "confluence.podLabels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ include "confluence.serviceAccountName" . }}

diff --git a/src/main/charts/confluence/templates/statefulset.yaml b/src/main/charts/confluence/templates/statefulset.yaml
@@ -36,7 +36,7 @@ spec:
         {{- end }}
         {{- include "confluence.podAnnotations" . | nindent 8 }}
       labels:
-        {{- include "common.labels.selectorLabels" . | nindent 8 }}
+        {{- include "common.labels.commonLabels" . | nindent 8 }}
         {{- include "confluence.podLabels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ include "confluence.serviceAccountName" . }}

diff --git a/src/main/charts/crowd/templates/statefulset.yaml b/src/main/charts/crowd/templates/statefulset.yaml
@@ -36,7 +36,7 @@ spec:
         {{- end }}
         {{- include "crowd.podAnnotations" . | nindent 8 }}
       labels:
-        {{- include "common.labels.selectorLabels" . | nindent 8 }}
+        {{- include "common.labels.commonLabels" . | nindent 8 }}
         {{- include "crowd.podLabels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ include "crowd.serviceAccountName" . }}

diff --git a/src/main/charts/jira/templates/statefulset.yaml b/src/main/charts/jira/templates/statefulset.yaml
@@ -36,7 +36,7 @@ spec:
         {{- end }}
         {{- include "jira.podAnnotations" . | nindent 8 }}
       labels:
-        {{- include "common.labels.selectorLabels" . | nindent 8 }}
+        {{- include "common.labels.commonLabels" . | nindent 8 }}
         {{- include "jira.podLabels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ include "jira.serviceAccountName" . }}

diff --git a/src/test/resources/expected_helm_output/bamboo/output.yaml b/src/test/resources/expected_helm_output/bamboo/output.yaml
@@ -451,8 +451,11 @@ spec:
       annotations:
         checksum/config-jvm: 7517342dd38443e26c4ad7d7e72c11d1dbab53a2e833032e46b71df455691778
       labels:
+        helm.sh/chart: bamboo-1.21.4
         app.kubernetes.io/name: bamboo
         app.kubernetes.io/instance: unittest-bamboo
+        app.kubernetes.io/version: "10.0.2"
+        app.kubernetes.io/managed-by: Helm
     spec:
       serviceAccountName: unittest-bamboo
       terminationGracePeriodSeconds: 30

diff --git a/src/test/resources/expected_helm_output/bitbucket/output.yaml b/src/test/resources/expected_helm_output/bitbucket/output.yaml
@@ -716,8 +716,11 @@ spec:
       annotations:
         checksum/config-jvm: 0047b616a0397cd0eff2856e33ee7ac5ca93c44e860d3912445c6a8f76b83dd8
       labels:
+        helm.sh/chart: bitbucket-1.21.4
         app.kubernetes.io/name: bitbucket
         app.kubernetes.io/instance: unittest-bitbucket
+        app.kubernetes.io/version: "8.19.10"
+        app.kubernetes.io/managed-by: Helm
     spec:
       serviceAccountName: unittest-bitbucket
       terminationGracePeriodSeconds: 35

diff --git a/src/test/resources/expected_helm_output/confluence/output.yaml b/src/test/resources/expected_helm_output/confluence/output.yaml
@@ -553,8 +553,11 @@ spec:
       annotations:
         checksum/config-jvm: 5c7e4f3183d49bd4e8c82a29b06246e551e4120042495652f1f9b27a0599a882
       labels:
+        helm.sh/chart: confluence-1.21.4
         app.kubernetes.io/name: confluence-synchrony
         app.kubernetes.io/instance: unittest-confluence
+        app.kubernetes.io/version: "8.5.16"
+        app.kubernetes.io/managed-by: Helm
     spec:
       serviceAccountName: unittest-confluence
       terminationGracePeriodSeconds: 25
@@ -635,8 +638,11 @@ spec:
       annotations:
         checksum/config-jvm: 5ecf6d102ac01540d0b521813ca75d6cdc919f86262d79e1e7bfcd92b3fd488a
       labels:
+        helm.sh/chart: confluence-1.21.4
         app.kubernetes.io/name: confluence
         app.kubernetes.io/instance: unittest-confluence
+        app.kubernetes.io/version: "8.5.16"
+        app.kubernetes.io/managed-by: Helm
     spec:
       serviceAccountName: unittest-confluence
       terminationGracePeriodSeconds: 25

diff --git a/src/test/resources/expected_helm_output/crowd/output.yaml b/src/test/resources/expected_helm_output/crowd/output.yaml
@@ -376,8 +376,11 @@ spec:
       annotations:
         checksum/config-jvm: 9dc9c943d7c40b8c7c70c066dec0ff512e2cff63f8d54f0518bffdb2da6c6c09
       labels:
+        helm.sh/chart: crowd-1.21.4
         app.kubernetes.io/name: crowd
         app.kubernetes.io/instance: unittest-crowd
+        app.kubernetes.io/version: "6.1.1"
+        app.kubernetes.io/managed-by: Helm
     spec:
       serviceAccountName: unittest-crowd
       terminationGracePeriodSeconds: 30

diff --git a/src/test/resources/expected_helm_output/jira/output.yaml b/src/test/resources/expected_helm_output/jira/output.yaml
@@ -398,8 +398,11 @@ spec:
       annotations:
         checksum/config-jvm: 579c934bbac667c917645262df123ff5afe749a2e250e1dbac74789f83e45e1f
       labels:
+        helm.sh/chart: jira-1.21.4
         app.kubernetes.io/name: jira
         app.kubernetes.io/instance: unittest-jira
+        app.kubernetes.io/version: "9.12.14"
+        app.kubernetes.io/managed-by: Helm
     spec:
       serviceAccountName: unittest-jira
       terminationGracePeriodSeconds: 30