Update Bitbucket and Confluence LTS versions (#924)

* Update Bitbucket and Confluence LTS versions

* Fix comparison test

---------

Co-authored-by: Yevhen Ivantsov <[email protected]>

Author: bianchi2

src/main/charts/bitbucket/Chart.yaml

@@ -3,7 +3,7 @@ name: bitbucket
 description: A chart for installing Bitbucket Data Center on Kubernetes
 type: application
 version: '1.22.0'
-appVersion: 8.19.12
+appVersion: 9.4.0
 kubeVersion: ">=1.21.x-0"
 keywords:
 - Bitbucket

src/main/charts/bitbucket/values.yaml

@@ -980,7 +980,7 @@ bitbucket:
 
       # -- The docker image tag to be used
       #
-      tag: "2.0.1"
+      tag: "3.4.0"
 
     # -- Number of Bitbucket Mesh nodes. Do not change it. Currently, only the quorum of 3 mesh nodes is supported.
     # Reducing the number of replicas will result in mesh degradation while increasing the number of Mesh nodes

src/main/charts/confluence/Chart.yaml

@@ -3,7 +3,7 @@ name: confluence
 description: A chart for installing Confluence Data Center on Kubernetes
 type: application
 version: '1.22.0'
-appVersion: 8.5.17
+appVersion: 8.5.18
 kubeVersion: ">=1.21.x-0"
 keywords:
 - Confluence

src/test/resources/expected_helm_output/bitbucket/output.yaml

@@ -8,7 +8,7 @@ metadata:
     helm.sh/chart: bitbucket-1.22.0
     app.kubernetes.io/name: bitbucket
     app.kubernetes.io/instance: unittest-bitbucket
-    app.kubernetes.io/version: "8.19.12"
+    app.kubernetes.io/version: "9.4.0"
     app.kubernetes.io/managed-by: Helm
 ---
 # Source: bitbucket/templates/config-jvm-mesh.yaml
@@ -20,7 +20,7 @@ metadata:
     helm.sh/chart: bitbucket-1.22.0
     app.kubernetes.io/name: bitbucket
     app.kubernetes.io/instance: unittest-bitbucket
-    app.kubernetes.io/version: "8.19.12"
+    app.kubernetes.io/version: "9.4.0"
     app.kubernetes.io/managed-by: Helm
 data:
   additional_jvm_args: >-
@@ -38,7 +38,7 @@ metadata:
     helm.sh/chart: bitbucket-1.22.0
     app.kubernetes.io/name: bitbucket
     app.kubernetes.io/instance: unittest-bitbucket
-    app.kubernetes.io/version: "8.19.12"
+    app.kubernetes.io/version: "9.4.0"
     app.kubernetes.io/managed-by: Helm
 data:
   additional_jvm_args: >-
@@ -57,7 +57,7 @@ metadata:
     helm.sh/chart: bitbucket-1.22.0
     app.kubernetes.io/name: bitbucket
     app.kubernetes.io/instance: unittest-bitbucket
-    app.kubernetes.io/version: "8.19.12"
+    app.kubernetes.io/version: "9.4.0"
     app.kubernetes.io/managed-by: Helm
 data:
   jmx-config.yaml: |
@@ -79,7 +79,7 @@ metadata:
     helm.sh/chart: bitbucket-1.22.0
     app.kubernetes.io/name: bitbucket
     app.kubernetes.io/instance: unittest-bitbucket
-    app.kubernetes.io/version: "8.19.12"
+    app.kubernetes.io/version: "9.4.0"
     app.kubernetes.io/managed-by: Helm
 data:
   values.yaml: |
@@ -162,7 +162,7 @@ data:
         image:
           pullPolicy: IfNotPresent
           repository: atlassian/bitbucket-mesh
-          tag: 2.0.1
+          tag: 3.4.0
         nodeAutoRegistration: false
         nodeSelector: {}
         podAnnotations: {}
@@ -442,7 +442,7 @@ metadata:
     helm.sh/chart: bitbucket-1.22.0
     app.kubernetes.io/name: bitbucket
     app.kubernetes.io/instance: unittest-bitbucket
-    app.kubernetes.io/version: "8.19.12"
+    app.kubernetes.io/version: "9.4.0"
     app.kubernetes.io/managed-by: Helm
   annotations:
 spec:
@@ -468,7 +468,7 @@ metadata:
     helm.sh/chart: bitbucket-1.22.0
     app.kubernetes.io/name: bitbucket
     app.kubernetes.io/instance: unittest-bitbucket
-    app.kubernetes.io/version: "8.19.12"
+    app.kubernetes.io/version: "9.4.0"
     app.kubernetes.io/managed-by: Helm
   annotations:
 spec:
@@ -494,7 +494,7 @@ metadata:
     helm.sh/chart: bitbucket-1.22.0
     app.kubernetes.io/name: bitbucket
     app.kubernetes.io/instance: unittest-bitbucket
-    app.kubernetes.io/version: "8.19.12"
+    app.kubernetes.io/version: "9.4.0"
     app.kubernetes.io/managed-by: Helm
   annotations:
 spec:
@@ -520,7 +520,7 @@ metadata:
     helm.sh/chart: bitbucket-1.22.0
     app.kubernetes.io/name: bitbucket
     app.kubernetes.io/instance: unittest-bitbucket
-    app.kubernetes.io/version: "8.19.12"
+    app.kubernetes.io/version: "9.4.0"
     app.kubernetes.io/managed-by: Helm
   annotations:
 spec:
@@ -546,7 +546,7 @@ metadata:
     helm.sh/chart: bitbucket-1.22.0
     app.kubernetes.io/name: bitbucket
     app.kubernetes.io/instance: unittest-bitbucket
-    app.kubernetes.io/version: "8.19.12"
+    app.kubernetes.io/version: "9.4.0"
     app.kubernetes.io/managed-by: Helm
   annotations:
 spec:
@@ -578,7 +578,7 @@ metadata:
     helm.sh/chart: bitbucket-1.22.0
     app.kubernetes.io/name: bitbucket
     app.kubernetes.io/instance: unittest-bitbucket
-    app.kubernetes.io/version: "8.19.12"
+    app.kubernetes.io/version: "9.4.0"
     app.kubernetes.io/managed-by: Helm
   annotations:
     argocd.argoproj.io/sync-wave: "10"
@@ -593,7 +593,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config-jvm: fa5fb52d5acfd16b972384b7b11c61f2e04db1a9ea250eafbff680ec8470461d
+        checksum/config-jvm: b30627a2f683080e790424e0aeeb120e1a2883f7f08f8f78c0cc6dc643c273f6
       labels:
         app.kubernetes.io/name: bitbucket-mesh
         app.kubernetes.io/instance: unittest-bitbucket
@@ -617,7 +617,7 @@ spec:
             runAsUser: 0
       containers:
         - name: bitbucket-mesh
-          image: atlassian/bitbucket-mesh:2.0.1
+          image: atlassian/bitbucket-mesh:3.4.0
           imagePullPolicy: IfNotPresent
           ports:
             - name: mesh
@@ -699,7 +699,7 @@ metadata:
     helm.sh/chart: bitbucket-1.22.0
     app.kubernetes.io/name: bitbucket
     app.kubernetes.io/instance: unittest-bitbucket
-    app.kubernetes.io/version: "8.19.12"
+    app.kubernetes.io/version: "9.4.0"
     app.kubernetes.io/managed-by: Helm
   annotations:
     argocd.argoproj.io/sync-wave: "10"
@@ -714,12 +714,12 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config-jvm: f3cd6f92a07ad448d350991df65ec9d7e4094ae184f68c2616c9f28bf4816437
+        checksum/config-jvm: 55eeeeb9f6ddc0a7f95ea94deaf85db8c1935e440ed06af57bbe5480aece8f69
       labels:
         helm.sh/chart: bitbucket-1.22.0
         app.kubernetes.io/name: bitbucket
         app.kubernetes.io/instance: unittest-bitbucket
-        app.kubernetes.io/version: "8.19.12"
+        app.kubernetes.io/version: "9.4.0"
         app.kubernetes.io/managed-by: Helm
     spec:
       serviceAccountName: unittest-bitbucket
@@ -743,7 +743,7 @@ spec:
               name: shared-home
       containers:
         - name: bitbucket
-          image: "atlassian/bitbucket:8.19.12"
+          image: "atlassian/bitbucket:9.4.0"
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -842,7 +842,7 @@ metadata:
     helm.sh/chart: bitbucket-1.22.0
     app.kubernetes.io/name: bitbucket
     app.kubernetes.io/instance: unittest-bitbucket
-    app.kubernetes.io/version: "8.19.12"
+    app.kubernetes.io/version: "9.4.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   containers:
@@ -874,7 +874,7 @@ metadata:
     helm.sh/chart: bitbucket-1.22.0
     app.kubernetes.io/name: bitbucket
     app.kubernetes.io/instance: unittest-bitbucket
-    app.kubernetes.io/version: "8.19.12"
+    app.kubernetes.io/version: "9.4.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   containers:

src/test/resources/expected_helm_output/confluence/output.yaml

@@ -8,7 +8,7 @@ metadata:
     helm.sh/chart: confluence-1.22.0
     app.kubernetes.io/name: confluence
     app.kubernetes.io/instance: unittest-confluence
-    app.kubernetes.io/version: "8.5.17"
+    app.kubernetes.io/version: "8.5.18"
     app.kubernetes.io/managed-by: Helm
 ---
 # Source: confluence/templates/config-jvm.yaml
@@ -20,7 +20,7 @@ metadata:
     helm.sh/chart: confluence-1.22.0
     app.kubernetes.io/name: confluence
     app.kubernetes.io/instance: unittest-confluence
-    app.kubernetes.io/version: "8.5.17"
+    app.kubernetes.io/version: "8.5.18"
     app.kubernetes.io/managed-by: Helm
 data:
   additional_jvm_args: >-
@@ -43,7 +43,7 @@ metadata:
     helm.sh/chart: confluence-1.22.0
     app.kubernetes.io/name: confluence
     app.kubernetes.io/instance: unittest-confluence
-    app.kubernetes.io/version: "8.5.17"
+    app.kubernetes.io/version: "8.5.18"
     app.kubernetes.io/managed-by: Helm
 data:
   jmx-config.yaml: |
@@ -65,7 +65,7 @@ metadata:
     helm.sh/chart: confluence-1.22.0
     app.kubernetes.io/name: confluence
     app.kubernetes.io/instance: unittest-confluence
-    app.kubernetes.io/version: "8.5.17"
+    app.kubernetes.io/version: "8.5.18"
     app.kubernetes.io/managed-by: Helm
 data:
   values.yaml: |
@@ -460,7 +460,7 @@ metadata:
     helm.sh/chart: confluence-1.22.0
     app.kubernetes.io/name: confluence
     app.kubernetes.io/instance: unittest-confluence
-    app.kubernetes.io/version: "8.5.17"
+    app.kubernetes.io/version: "8.5.18"
     app.kubernetes.io/managed-by: Helm
   annotations:
 spec:
@@ -483,7 +483,7 @@ metadata:
     helm.sh/chart: confluence-1.22.0
     app.kubernetes.io/name: confluence-synchrony
     app.kubernetes.io/instance: unittest-confluence
-    app.kubernetes.io/version: "8.5.17"
+    app.kubernetes.io/version: "8.5.18"
     app.kubernetes.io/managed-by: Helm
   annotations:
 spec:
@@ -510,7 +510,7 @@ metadata:
     helm.sh/chart: confluence-1.22.0
     app.kubernetes.io/name: confluence
     app.kubernetes.io/instance: unittest-confluence
-    app.kubernetes.io/version: "8.5.17"
+    app.kubernetes.io/version: "8.5.18"
     app.kubernetes.io/managed-by: Helm
   annotations:
 spec:
@@ -538,7 +538,7 @@ metadata:
     helm.sh/chart: confluence-1.22.0
     app.kubernetes.io/name: confluence-synchrony
     app.kubernetes.io/instance: unittest-confluence
-    app.kubernetes.io/version: "8.5.17"
+    app.kubernetes.io/version: "8.5.18"
     app.kubernetes.io/managed-by: Helm
   annotations:
     argocd.argoproj.io/sync-wave: "10"
@@ -557,7 +557,7 @@ spec:
         helm.sh/chart: confluence-1.22.0
         app.kubernetes.io/name: confluence-synchrony
         app.kubernetes.io/instance: unittest-confluence
-        app.kubernetes.io/version: "8.5.17"
+        app.kubernetes.io/version: "8.5.18"
         app.kubernetes.io/managed-by: Helm
     spec:
       serviceAccountName: unittest-confluence
@@ -570,7 +570,7 @@ spec:
           ip: 192.168.1.1
       containers:
         - name: synchrony
-          image: "atlassian/confluence:8.5.17"
+          image: "atlassian/confluence:8.5.18"
           imagePullPolicy: IfNotPresent
           command: ["/scripts/start-synchrony.sh"]
           volumeMounts:
@@ -623,7 +623,7 @@ metadata:
     helm.sh/chart: confluence-1.22.0
     app.kubernetes.io/name: confluence
     app.kubernetes.io/instance: unittest-confluence
-    app.kubernetes.io/version: "8.5.17"
+    app.kubernetes.io/version: "8.5.18"
     app.kubernetes.io/managed-by: Helm
   annotations:
     argocd.argoproj.io/sync-wave: "10"
@@ -637,12 +637,12 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config-jvm: 7bfc7d2515d63b68deb9827915f4a52f6ad5c0c621475dd37d812a664f993cd0
+        checksum/config-jvm: e46d88aed9fa256bd65396d93dc449adaf26ff510853d92f66b1354133b2ab02
       labels:
         helm.sh/chart: confluence-1.22.0
         app.kubernetes.io/name: confluence
         app.kubernetes.io/instance: unittest-confluence
-        app.kubernetes.io/version: "8.5.17"
+        app.kubernetes.io/version: "8.5.18"
         app.kubernetes.io/managed-by: Helm
     spec:
       serviceAccountName: unittest-confluence
@@ -674,7 +674,7 @@ spec:
               name: shared-home
       containers:
         - name: confluence
-          image: "atlassian/confluence:8.5.17"
+          image: "atlassian/confluence:8.5.18"
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -776,7 +776,7 @@ metadata:
     helm.sh/chart: confluence-1.22.0
     app.kubernetes.io/name: confluence
     app.kubernetes.io/instance: unittest-confluence
-    app.kubernetes.io/version: "8.5.17"
+    app.kubernetes.io/version: "8.5.18"
     app.kubernetes.io/managed-by: Helm
 spec:
   containers:
@@ -807,7 +807,7 @@ metadata:
     helm.sh/chart: confluence-1.22.0
     app.kubernetes.io/name: confluence
     app.kubernetes.io/instance: unittest-confluence
-    app.kubernetes.io/version: "8.5.17"
+    app.kubernetes.io/version: "8.5.18"
     app.kubernetes.io/managed-by: Helm
 spec:
   containers: