Added pvc retention policy to Bitbucket Mesh StatefulSet (#755)

* Added pvc retention policy to Bitbucket Mesh StatefulSet. * Updated Helm docs version in 'Update LTS tag' Github Action.
atlassian · Feb 5, 2024 · 737d6e7 · 737d6e7
1 parent 874f570
commit 737d6e7
Show file tree

Hide file tree

Showing 11 changed files with 934 additions and 931 deletions.
diff --git a/.github/workflows/update-lts-tags.yaml b/.github/workflows/update-lts-tags.yaml
@@ -28,7 +28,7 @@ jobs:
       - name: Install Helm Docs
         uses: envoy/install-helm-docs@v1.0.0
         with:
-          version: 1.11.0
+          version: 1.12.0
 
       - name: Configure Git
         run: |

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/norwoodj/helm-docs
-    rev: v1.2.0
+    rev: v1.12.0
     hooks:
       - id: helm-docs
         args:

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/bitbucket/README.md b/src/main/charts/bitbucket/README.md
diff --git a/src/main/charts/bitbucket/templates/_helpers.tpl b/src/main/charts/bitbucket/templates/_helpers.tpl
@@ -394,6 +394,11 @@ volumeClaimTemplates:
 
 {{- define "bitbucket.mesh.volumeClaimTemplates" -}}
 {{- if .Values.bitbucket.mesh.volume.create }}
+{{- if and .Values.bitbucket.mesh.volume.persistentVolumeClaimRetentionPolicy.whenDeleted .Values.bitbucket.mesh.volume.persistentVolumeClaimRetentionPolicy.whenScaled }}
+persistentVolumeClaimRetentionPolicy:
+    whenDeleted: {{.Values.bitbucket.mesh.volume.persistentVolumeClaimRetentionPolicy.whenDeleted}}
+    whenScaled: {{.Values.bitbucket.mesh.volume.persistentVolumeClaimRetentionPolicy.whenScaled}}
+{{- end}}
 volumeClaimTemplates:
 - metadata:
     name: mesh-home

diff --git a/src/main/charts/bitbucket/values.yaml b/src/main/charts/bitbucket/values.yaml
@@ -1032,6 +1032,9 @@ bitbucket:
           storage: 1Gi
       storageClass:
       mountPath: "/var/atlassian/application-data/mesh"
+      persistentVolumeClaimRetentionPolicy:
+        whenDeleted:
+        whenScaled:
 
     # -- Defines any additional environment variables to be passed to the Bitbucket mesh containers.
     #

diff --git a/src/main/charts/confluence/README.md b/src/main/charts/confluence/README.md
diff --git a/src/main/charts/crowd/README.md b/src/main/charts/crowd/README.md
diff --git a/src/main/charts/jira/README.md b/src/main/charts/jira/README.md
diff --git a/src/test/resources/expected_helm_output/bitbucket/output.yaml b/src/test/resources/expected_helm_output/bitbucket/output.yaml
@@ -185,6 +185,9 @@ data:
         volume:
           create: true
           mountPath: /var/atlassian/application-data/mesh
+          persistentVolumeClaimRetentionPolicy:
+            whenDeleted: null
+            whenScaled: null
           resources:
             requests:
               storage: 1Gi