Fix fixtures

SonarSource · Dec 20, 2024 · cfbb48e · cfbb48e
1 parent cb16924
commit cfbb48e
Show file tree

Hide file tree

Showing 28 changed files with 154 additions and 770 deletions.
diff --git a/tests/unit-compatibility-test/fixtures/sonarqube/ca-certificates-configmap.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/ca-certificates-configmap.yaml
@@ -404,11 +404,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: sonarqube
     app.kubernetes.io/component: ca-certificates-configmap.yaml-sonarqube
-<<<<<<< HEAD
-    app.kubernetes.io/version: "24.12.0.100206-community"
-=======
-    app.kubernetes.io/version: "10.8.0-enterprise"
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+    app.kubernetes.io/version: "10.8.1-enterprise"
 spec:
   replicas: 1
   revisionHistoryLimit: 10
@@ -433,11 +429,7 @@ spec:
         fsGroup: 0
       initContainers:
         - name: "wait-for-db"
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -453,11 +445,7 @@ spec:
           command: ["/bin/bash", "-c"]
           args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/ca-certificates-configmap.yaml-postgresql/5432) && exit 0; sleep 2;done; exit 1']
         - name: ca-certs
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           command: ["sh"]
           args: ["-c", "cp -f \"${JAVA_HOME}/lib/security/cacerts\" /tmp/certs/cacerts; if [ \"$(ls /tmp/secrets/ca-certs)\" ]; then for f in /tmp/secrets/ca-certs/*; do keytool -importcert -file \"${f}\" -alias \"$(basename \"${f}\")\" -keystore /tmp/certs/cacerts -storepass changeit -trustcacerts -noprompt; done; fi;"]
@@ -486,11 +474,7 @@ spec:
             - name: SONAR_CE_JAVAOPTS
               value: -Djavax.net.ssl.trustStore=/opt/sonarqube/certs/cacerts
         - name: init-sysctl
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           securityContext:
             privileged: true
@@ -508,11 +492,7 @@ spec:
             - name: SONAR_CE_JAVAOPTS
               value: -Djavax.net.ssl.trustStore=/opt/sonarqube/certs/cacerts
         - name: install-oracle-jdbc-driver
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           command: ["sh", "-e", "/tmp/scripts/install_oracle_jdbc_driver.sh"]
           securityContext:
@@ -545,11 +525,7 @@ spec:
               value: -Djavax.net.ssl.trustStore=/opt/sonarqube/certs/cacerts
       containers:
         - name: sonarqube
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -700,11 +676,7 @@ spec:
   automountServiceAccountToken: false
   containers:
     - name: ca-certificates-configmap.yaml-ui-test
-<<<<<<< HEAD
-      image: "sonarqube:24.12.0.100206-community"
-=======
-      image: "sonarqube:10.8.0-enterprise"
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+      image: "sonarqube:10.8.1-enterprise"
       imagePullPolicy: IfNotPresent
       command: ['wget']
       args: [

diff --git a/tests/unit-compatibility-test/fixtures/sonarqube/ca-certificates-secret.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/ca-certificates-secret.yaml
@@ -388,11 +388,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: sonarqube
     app.kubernetes.io/component: ca-certificates-secret.yaml-sonarqube
-<<<<<<< HEAD
-    app.kubernetes.io/version: "24.12.0.100206-community"
-=======
-    app.kubernetes.io/version: "10.8.0-enterprise"
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+    app.kubernetes.io/version: "10.8.1-enterprise"
 spec:
   replicas: 1
   revisionHistoryLimit: 10
@@ -417,11 +413,7 @@ spec:
         fsGroup: 0
       initContainers:
         - name: "wait-for-db"
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -437,11 +429,7 @@ spec:
           command: ["/bin/bash", "-c"]
           args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/ca-certificates-secret.yaml-postgresql/5432) && exit 0; sleep 2;done; exit 1']
         - name: ca-certs
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           command: ["sh"]
           args: ["-c", "cp -f \"${JAVA_HOME}/lib/security/cacerts\" /tmp/certs/cacerts; if [ \"$(ls /tmp/secrets/ca-certs)\" ]; then for f in /tmp/secrets/ca-certs/*; do keytool -importcert -file \"${f}\" -alias \"$(basename \"${f}\")\" -keystore /tmp/certs/cacerts -storepass changeit -trustcacerts -noprompt; done; fi;"]
@@ -470,11 +458,7 @@ spec:
             - name: SONAR_CE_JAVAOPTS
               value: -Djavax.net.ssl.trustStore=/opt/sonarqube/certs/cacerts
         - name: init-sysctl
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           securityContext:
             privileged: true
@@ -493,11 +477,7 @@ spec:
               value: -Djavax.net.ssl.trustStore=/opt/sonarqube/certs/cacerts
       containers:
         - name: sonarqube
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -631,11 +611,7 @@ spec:
   automountServiceAccountToken: false
   containers:
     - name: ca-certificates-secret.yaml-ui-test
-<<<<<<< HEAD
-      image: "sonarqube:24.12.0.100206-community"
-=======
-      image: "sonarqube:10.8.0-enterprise"
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+      image: "sonarqube:10.8.1-enterprise"
       imagePullPolicy: IfNotPresent
       command: ['wget']
       args: [

diff --git a/tests/unit-compatibility-test/fixtures/sonarqube/change-admin-password-hook-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/change-admin-password-hook-values.yaml
@@ -402,11 +402,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: sonarqube
     app.kubernetes.io/component: change-admin-password-hook-values.yaml-sonarqube
-<<<<<<< HEAD
-    app.kubernetes.io/version: "24.12.0.100206-community"
-=======
-    app.kubernetes.io/version: "10.8.0-enterprise"
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+    app.kubernetes.io/version: "10.8.1-enterprise"
 spec:
   replicas: 1
   revisionHistoryLimit: 10
@@ -431,11 +427,7 @@ spec:
         fsGroup: 0
       initContainers:
         - name: "wait-for-db"
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -451,11 +443,7 @@ spec:
           command: ["/bin/bash", "-c"]
           args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/change-admin-password-hook-values.yaml-postgresql/5432) && exit 0; sleep 2;done; exit 1']
         - name: init-sysctl
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           securityContext:
             privileged: true
@@ -474,11 +462,7 @@ spec:
               value: ""
       containers:
         - name: sonarqube
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -609,11 +593,7 @@ spec:
   automountServiceAccountToken: false
   containers:
     - name: change-admin-password-hook-values.yaml-ui-test
-<<<<<<< HEAD
-      image: "sonarqube:24.12.0.100206-community"
-=======
-      image: "sonarqube:10.8.0-enterprise"
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+      image: "sonarqube:10.8.1-enterprise"
       imagePullPolicy: IfNotPresent
       command: ['wget']
       args: [

diff --git a/tests/unit-compatibility-test/fixtures/sonarqube/config-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/config-values.yaml
@@ -392,11 +392,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: sonarqube
     app.kubernetes.io/component: config-values.yaml-sonarqube
-<<<<<<< HEAD
-    app.kubernetes.io/version: "24.12.0.100206-community"
-=======
-    app.kubernetes.io/version: "10.8.0-enterprise"
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+    app.kubernetes.io/version: "10.8.1-enterprise"
 spec:
   replicas: 1
   revisionHistoryLimit: 10
@@ -421,11 +417,7 @@ spec:
         fsGroup: 0
       initContainers:
         - name: "wait-for-db"
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -441,11 +433,7 @@ spec:
           command: ["/bin/bash", "-c"]
           args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/config-values.yaml-postgresql/5432) && exit 0; sleep 2;done; exit 1']
         - name: init-sysctl
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           securityContext:
             privileged: true
@@ -463,11 +451,7 @@ spec:
             - name: SONAR_CE_JAVAOPTS
               value: ""
         - name: concat-properties
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           command:
             - sh
@@ -512,11 +496,7 @@ spec:
               value: ""
       containers:
         - name: sonarqube
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -677,11 +657,7 @@ spec:
   automountServiceAccountToken: false
   containers:
     - name: config-values.yaml-ui-test
-<<<<<<< HEAD
-      image: "sonarqube:24.12.0.100206-community"
-=======
-      image: "sonarqube:10.8.0-enterprise"
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+      image: "sonarqube:10.8.1-enterprise"
       imagePullPolicy: IfNotPresent
       command: ['wget']
       args: [

diff --git a/tests/unit-compatibility-test/fixtures/sonarqube/default-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/default-values.yaml
@@ -388,11 +388,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: sonarqube
     app.kubernetes.io/component: default-values.yaml-sonarqube
-<<<<<<< HEAD
-    app.kubernetes.io/version: "24.12.0.100206-community"
-=======
-    app.kubernetes.io/version: "10.8.0-enterprise"
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+    app.kubernetes.io/version: "10.8.1-enterprise"
 spec:
   replicas: 1
   revisionHistoryLimit: 10
@@ -417,11 +413,7 @@ spec:
         fsGroup: 0
       initContainers:
         - name: "wait-for-db"
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -437,11 +429,7 @@ spec:
           command: ["/bin/bash", "-c"]
           args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/default-values.yaml-postgresql/5432) && exit 0; sleep 2;done; exit 1']
         - name: init-sysctl
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           securityContext:
             privileged: true
@@ -460,11 +448,7 @@ spec:
               value: ""
       containers:
         - name: sonarqube
-<<<<<<< HEAD
-          image: sonarqube:24.12.0.100206-community
-=======
-          image: sonarqube:10.8.0-enterprise
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+          image: sonarqube:10.8.1-enterprise
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -595,11 +579,7 @@ spec:
   automountServiceAccountToken: false
   containers:
     - name: default-values.yaml-ui-test
-<<<<<<< HEAD
-      image: "sonarqube:24.12.0.100206-community"
-=======
-      image: "sonarqube:10.8.0-enterprise"
->>>>>>> 287f8b3 (SONAR-23559 Improves editions and versions setting for sonarqube chart)
+      image: "sonarqube:10.8.1-enterprise"
       imagePullPolicy: IfNotPresent
       command: ['wget']
       args: [