From c418532cccf0beb231ac39d5d96c415534576bb5 Mon Sep 17 00:00:00 2001 From: Quentin <23108069+HujinoKun@users.noreply.github.com> Date: Sun, 10 Aug 2025 11:59:34 +0000 Subject: [PATCH 1/2] fix: Added default Kubernetes parameters to VolumeClaimTemplate to prevent infinite DRIFT --- src/main/charts/bamboo/templates/_helpers.tpl | 4 +++- src/main/charts/bitbucket/templates/_helpers.tpl | 4 +++- src/main/charts/confluence/templates/_helpers.tpl | 8 ++++++-- src/main/charts/crowd/templates/_helpers.tpl | 4 +++- src/main/charts/jira/templates/_helpers.tpl | 4 +++- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/main/charts/bamboo/templates/_helpers.tpl b/src/main/charts/bamboo/templates/_helpers.tpl index 2cafd7c32..33b9529ff 100644 --- a/src/main/charts/bamboo/templates/_helpers.tpl +++ b/src/main/charts/bamboo/templates/_helpers.tpl @@ -366,7 +366,9 @@ persistentVolumeClaimRetentionPolicy: {{- end}} volumeClaimTemplates: {{- if .Values.volumes.localHome.persistentVolumeClaim.create }} -- metadata: +- apiVersion: v1 + kind: PersistentVolumeClaim + metadata: name: local-home spec: accessModes: [ "ReadWriteOnce" ] diff --git a/src/main/charts/bitbucket/templates/_helpers.tpl b/src/main/charts/bitbucket/templates/_helpers.tpl index 611d83cc6..da95d3983 100644 --- a/src/main/charts/bitbucket/templates/_helpers.tpl +++ b/src/main/charts/bitbucket/templates/_helpers.tpl @@ -375,7 +375,9 @@ persistentVolumeClaimRetentionPolicy: {{- end}} volumeClaimTemplates: {{- if .Values.volumes.localHome.persistentVolumeClaim.create }} -- metadata: +- apiVersion: v1 + kind: PersistentVolumeClaim + metadata: name: local-home spec: accessModes: [ "ReadWriteOnce" ] diff --git a/src/main/charts/confluence/templates/_helpers.tpl b/src/main/charts/confluence/templates/_helpers.tpl index 8a7aed5db..7124aae72 100644 --- a/src/main/charts/confluence/templates/_helpers.tpl +++ b/src/main/charts/confluence/templates/_helpers.tpl @@ -569,7 +569,9 @@ persistentVolumeClaimRetentionPolicy: {{- end}} volumeClaimTemplates: {{- if .Values.volumes.localHome.persistentVolumeClaim.create }} -- metadata: +- apiVersion: v1 + kind: PersistentVolumeClaim + metadata: name: local-home spec: accessModes: [ "ReadWriteOnce" ] @@ -605,7 +607,9 @@ persistentVolumeClaimRetentionPolicy: whenScaled: {{.Values.volumes.synchronyHome.persistentVolumeClaimRetentionPolicy.whenScaled}} {{- end}} volumeClaimTemplates: -- metadata: +- apiVersion: v1 + kind: PersistentVolumeClaim + metadata: name: synchrony-home spec: accessModes: [ "ReadWriteOnce" ] diff --git a/src/main/charts/crowd/templates/_helpers.tpl b/src/main/charts/crowd/templates/_helpers.tpl index e5437050f..10f98d061 100644 --- a/src/main/charts/crowd/templates/_helpers.tpl +++ b/src/main/charts/crowd/templates/_helpers.tpl @@ -317,7 +317,9 @@ persistentVolumeClaimRetentionPolicy: {{- end}} volumeClaimTemplates: {{- if .Values.volumes.localHome.persistentVolumeClaim.create }} -- metadata: +- apiVersion: v1 + kind: PersistentVolumeClaim + metadata: name: local-home spec: accessModes: [ "ReadWriteOnce" ] diff --git a/src/main/charts/jira/templates/_helpers.tpl b/src/main/charts/jira/templates/_helpers.tpl index 43fb33b38..4f9cc1b20 100644 --- a/src/main/charts/jira/templates/_helpers.tpl +++ b/src/main/charts/jira/templates/_helpers.tpl @@ -413,7 +413,9 @@ persistentVolumeClaimRetentionPolicy: {{- end}} volumeClaimTemplates: {{- if .Values.volumes.localHome.persistentVolumeClaim.create }} -- metadata: +- apiVersion: v1 + kind: PersistentVolumeClaim + metadata: name: local-home spec: accessModes: [ "ReadWriteOnce" ] From 77c7cb6f431617df551e6d552ed8c0e67942a7d5 Mon Sep 17 00:00:00 2001 From: Yevhen Ivantsov Date: Tue, 4 Nov 2025 04:45:19 +1100 Subject: [PATCH 2/2] Fix tests --- .../resources/expected_helm_output/bamboo-agent/output.yaml | 2 +- src/test/resources/expected_helm_output/bamboo/output.yaml | 2 +- .../resources/expected_helm_output/bitbucket/output.yaml | 4 ++-- .../resources/expected_helm_output/confluence/output.yaml | 2 +- src/test/resources/expected_helm_output/crowd/output.yaml | 6 +++--- src/test/resources/expected_helm_output/jira/output.yaml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/test/resources/expected_helm_output/bamboo-agent/output.yaml b/src/test/resources/expected_helm_output/bamboo-agent/output.yaml index fe19b83cd..ef184d6d6 100644 --- a/src/test/resources/expected_helm_output/bamboo-agent/output.yaml +++ b/src/test/resources/expected_helm_output/bamboo-agent/output.yaml @@ -46,7 +46,7 @@ spec: template: metadata: annotations: - checksum/config-jvm: 65812517f73ea4851a65c05f44bc00031c22360901bd428a480cc34da383ff73 + checksum/config-jvm: e6302b5d728be9cb0332d747ef6e6d9ef2b7dc400065102fdb4d9759e6b58b57 labels: app.kubernetes.io/name: bamboo-agent app.kubernetes.io/instance: unittest-bamboo-agent diff --git a/src/test/resources/expected_helm_output/bamboo/output.yaml b/src/test/resources/expected_helm_output/bamboo/output.yaml index 6a35ac857..618b13b9d 100644 --- a/src/test/resources/expected_helm_output/bamboo/output.yaml +++ b/src/test/resources/expected_helm_output/bamboo/output.yaml @@ -457,7 +457,7 @@ spec: template: metadata: annotations: - checksum/config-jvm: 6139b68a0cb8cc3041fe762f5ee766ba2a413c168584f4db7f2978f1d7dc0392 + checksum/config-jvm: d39ffe576460a5be8eaa579df4e744d7fca12e30af7579f63412fcf3bd4f4dd8 labels: helm.sh/chart: bamboo-2.0.4 app.kubernetes.io/name: bamboo diff --git a/src/test/resources/expected_helm_output/bitbucket/output.yaml b/src/test/resources/expected_helm_output/bitbucket/output.yaml index d34a21d47..1cffcb37f 100644 --- a/src/test/resources/expected_helm_output/bitbucket/output.yaml +++ b/src/test/resources/expected_helm_output/bitbucket/output.yaml @@ -603,7 +603,7 @@ spec: template: metadata: annotations: - checksum/config-jvm: 9d87fe02971b3280c98b630b6a74b979acc9c5e593d8484ea81136bda4bfd30b + checksum/config-jvm: cb9e5fb87fcd54e34c0f4e3b8c6d172bc0613964ef4289bdb3ebfdffe3510931 labels: app.kubernetes.io/name: bitbucket-mesh app.kubernetes.io/instance: unittest-bitbucket @@ -724,7 +724,7 @@ spec: template: metadata: annotations: - checksum/config-jvm: 8df48b44d600f578afe6ef9ea3a9baf219505c6306eade5f74bf628a5293a086 + checksum/config-jvm: 6526e9d5f767c7c61f1c789fc0582d8e3e46c6d8858e781dc5be5030c0159fdf labels: helm.sh/chart: bitbucket-2.0.4 app.kubernetes.io/name: bitbucket diff --git a/src/test/resources/expected_helm_output/confluence/output.yaml b/src/test/resources/expected_helm_output/confluence/output.yaml index 72ccdd8cf..edcff8c62 100644 --- a/src/test/resources/expected_helm_output/confluence/output.yaml +++ b/src/test/resources/expected_helm_output/confluence/output.yaml @@ -668,7 +668,7 @@ spec: template: metadata: annotations: - checksum/config-jvm: d1ef486def92fcd0f62c851d5662d8e4d3208e4984c271a8b2ad87b0d39e8839 + checksum/config-jvm: 04ff0c84ab05c7df598092cab4e3ed532c63c7ebdd6d6fa282db5cd050b64b49 labels: helm.sh/chart: confluence-2.0.4 app.kubernetes.io/name: confluence diff --git a/src/test/resources/expected_helm_output/crowd/output.yaml b/src/test/resources/expected_helm_output/crowd/output.yaml index dec44c7db..61ebcde9e 100644 --- a/src/test/resources/expected_helm_output/crowd/output.yaml +++ b/src/test/resources/expected_helm_output/crowd/output.yaml @@ -78,7 +78,7 @@ data: - hostnames: - foo.local - bar.local - ip: 127.1.0.1 + ip: 127.0.0.1 additionalInitContainers: [] additionalLabels: {} affinity: {} @@ -381,7 +381,7 @@ spec: template: metadata: annotations: - checksum/config-jvm: 47e5ef6b7cdca42357138b748035cc2654bfd6259d7cab902e8fc809f77ba214 + checksum/config-jvm: 497118b00b16287b7740f0f2bea19d09ff7aac932a47557021c98924575aef7e labels: helm.sh/chart: crowd-2.0.4 app.kubernetes.io/name: crowd @@ -395,7 +395,7 @@ spec: - hostnames: - foo.local - bar.local - ip: 127.1.0.1 + ip: 127.0.0.1 securityContext: fsGroup: 2004 fsGroupChangePolicy: OnRootMismatch diff --git a/src/test/resources/expected_helm_output/jira/output.yaml b/src/test/resources/expected_helm_output/jira/output.yaml index f1cdd8406..3d7fd12aa 100644 --- a/src/test/resources/expected_helm_output/jira/output.yaml +++ b/src/test/resources/expected_helm_output/jira/output.yaml @@ -424,7 +424,7 @@ spec: template: metadata: annotations: - checksum/config-jvm: 24817e66ebd401642aa14272c1a32f00fda584806ae3048a50fe29001daeef7e + checksum/config-jvm: 61db5d5c09601f3ab3a4a0800172be644e3ba0de0d23a6aa933bb7b743a48e39 labels: helm.sh/chart: jira-2.0.4 app.kubernetes.io/name: jira