diff --git a/tests/unit-compatibility-test/fixtures/sonarqube/ca-certificates-configmap.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/ca-certificates-configmap.yaml index d2e984397..38a2ba3a5 100644 --- 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 index c71309b70..3acb2df14 100644 --- 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 index 71bdbb32c..b387af06b 100644 --- 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 index 87ca821a1..4ae016d9b 100644 --- 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 index c72ce0b69..a496147f6 100644 --- 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: [ diff --git a/tests/unit-compatibility-test/fixtures/sonarqube/deployment-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/deployment-values.yaml index e9e42f528..7c21d76d7 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/deployment-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/deployment-values.yaml @@ -227,11 +227,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: deployment-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 @@ -257,11 +253,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 @@ -277,11 +269,7 @@ spec: command: ["/bin/bash", "-c"] args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/deployment-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 @@ -300,11 +288,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 @@ -596,11 +580,7 @@ spec: automountServiceAccountToken: false containers: - name: deployment-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/duplicated-env-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/duplicated-env-values.yaml index b23426b4c..e0776db71 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/duplicated-env-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/duplicated-env-values.yaml @@ -418,11 +418,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: duplicated-env-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 @@ -449,11 +445,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 @@ -469,11 +461,7 @@ spec: command: ["/bin/bash", "-c"] args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/duplicated-env-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 @@ -498,11 +486,7 @@ spec: value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8001:/opt/sonarqube/conf/prometheus-ce-config.yaml -Xms2G -Xmx2G -DsomeOption=some/Value - name: inject-prometheus-exporter -<<<<<<< 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 @@ -552,11 +536,7 @@ spec: -Xms2G -Xmx2G -DsomeOption=some/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 @@ -718,11 +698,7 @@ spec: automountServiceAccountToken: false containers: - name: duplicated-env-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/http-routes-default-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/http-routes-default-values.yaml index 2f3309256..510c16693 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/http-routes-default-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/http-routes-default-values.yaml @@ -388,11 +388,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: http-routes-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/http-routes-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 @@ -620,11 +604,7 @@ spec: automountServiceAccountToken: false containers: - name: http-routes-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: [ diff --git a/tests/unit-compatibility-test/fixtures/sonarqube/http-routes-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/http-routes-values.yaml index 163b9096a..b152126c8 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/http-routes-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/http-routes-values.yaml @@ -388,11 +388,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: http-routes-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/http-routes-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 @@ -620,11 +604,7 @@ spec: automountServiceAccountToken: false containers: - name: http-routes-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/ingress-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/ingress-values.yaml index 5c8ae54c5..0e7b46599 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/ingress-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/ingress-values.yaml @@ -388,11 +388,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: ingress-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/ingress-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 @@ -628,11 +612,7 @@ spec: automountServiceAccountToken: false containers: - name: ingress-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/ingress-with-controller.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/ingress-with-controller.yaml index 78eef13e4..570dc29e8 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/ingress-with-controller.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/ingress-with-controller.yaml @@ -830,11 +830,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: ingress-with-controller.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 @@ -859,11 +855,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 @@ -879,11 +871,7 @@ spec: command: ["/bin/bash", "-c"] args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/ingress-with-controller.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 @@ -902,11 +890,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 @@ -1251,11 +1235,7 @@ spec: automountServiceAccountToken: false containers: - name: ingress-with-controller.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/install-plugins-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/install-plugins-values.yaml index 1f3954a3a..6a6c02113 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/install-plugins-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/install-plugins-values.yaml @@ -391,11 +391,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: install-plugins-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 @@ -420,11 +416,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 @@ -440,11 +432,7 @@ spec: command: ["/bin/bash", "-c"] args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/install-plugins-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 @@ -462,11 +450,7 @@ spec: - name: SONAR_CE_JAVAOPTS value: "" - name: install-plugins -<<<<<<< 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_plugins.sh"] securityContext: @@ -510,11 +494,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 @@ -651,11 +631,7 @@ spec: automountServiceAccountToken: false containers: - name: install-plugins-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/jdbc-config-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/jdbc-config-values.yaml index 7763b6ce2..2df5279f4 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/jdbc-config-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/jdbc-config-values.yaml @@ -388,11 +388,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: jdbc-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 @@ -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/jdbc-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 @@ -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: jdbc-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/networkpolicy-new-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/networkpolicy-new-values.yaml index c9d008402..8bc6fd0cc 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/networkpolicy-new-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/networkpolicy-new-values.yaml @@ -510,11 +510,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: networkpolicy-new-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 @@ -539,11 +535,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 @@ -559,11 +551,7 @@ spec: command: ["/bin/bash", "-c"] args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/networkpolicy-new-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 @@ -582,11 +570,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 @@ -717,11 +701,7 @@ spec: automountServiceAccountToken: false containers: - name: networkpolicy-new-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/networkpolicy-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/networkpolicy-values.yaml index 4a7bd3aa7..925c65714 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/networkpolicy-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/networkpolicy-values.yaml @@ -510,11 +510,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: networkpolicy-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 @@ -539,11 +535,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 @@ -559,11 +551,7 @@ spec: command: ["/bin/bash", "-c"] args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/networkpolicy-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 @@ -582,11 +570,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 @@ -717,11 +701,7 @@ spec: automountServiceAccountToken: false containers: - name: networkpolicy-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/non-default-security-context-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/non-default-security-context-values.yaml index da42754a3..bbef012a7 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/non-default-security-context-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/non-default-security-context-values.yaml @@ -435,11 +435,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: non-default-security-context-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 @@ -466,11 +462,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 @@ -486,11 +478,7 @@ spec: command: ["/bin/bash", "-c"] args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/non-default-security-context-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 @@ -508,11 +496,7 @@ spec: - name: SONAR_CE_JAVAOPTS value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8001:/opt/sonarqube/conf/prometheus-ce-config.yaml - name: inject-prometheus-exporter -<<<<<<< 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 @@ -554,11 +538,7 @@ spec: - name: SONAR_CE_JAVAOPTS value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8001:/opt/sonarqube/conf/prometheus-ce-config.yaml - name: install-plugins -<<<<<<< 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_plugins.sh"] securityContext: @@ -602,11 +582,7 @@ spec: value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8001:/opt/sonarqube/conf/prometheus-ce-config.yaml 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 @@ -767,11 +743,7 @@ spec: automountServiceAccountToken: false containers: - name: non-default-security-context-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/openshift-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/openshift-values.yaml index 59960f357..5c44ccbd5 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/openshift-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/openshift-values.yaml @@ -341,11 +341,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: openshift-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 @@ -369,11 +365,7 @@ spec: {} 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 @@ -388,11 +380,7 @@ spec: args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/openshift-values.yaml-postgresql/5432) && exit 0; sleep 2;done; exit 1'] 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 @@ -539,11 +527,7 @@ spec: automountServiceAccountToken: false containers: - name: openshift-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/prometheus-monitoring-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/prometheus-monitoring-values.yaml index edfda59c3..6ee511b9e 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/prometheus-monitoring-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/prometheus-monitoring-values.yaml @@ -388,11 +388,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: prometheus-monitoring-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/prometheus-monitoring-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 @@ -622,11 +606,7 @@ spec: automountServiceAccountToken: false containers: - name: prometheus-monitoring-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/proxies-secret-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/proxies-secret-values.yaml index 9156e80a3..9e7d28a73 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/proxies-secret-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/proxies-secret-values.yaml @@ -391,11 +391,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: proxies-secret-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 @@ -420,11 +416,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 @@ -440,11 +432,7 @@ spec: command: ["/bin/bash", "-c"] args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/proxies-secret-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 @@ -462,11 +450,7 @@ spec: - name: SONAR_CE_JAVAOPTS value: "" - name: install-plugins -<<<<<<< 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_plugins.sh"] securityContext: @@ -510,11 +494,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 @@ -651,11 +631,7 @@ spec: automountServiceAccountToken: false containers: - name: proxies-secret-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/proxies-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/proxies-values.yaml index 217635fc1..2dd8da6cd 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/proxies-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/proxies-values.yaml @@ -421,11 +421,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: proxies-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 @@ -452,11 +448,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 @@ -472,11 +464,7 @@ spec: command: ["/bin/bash", "-c"] args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/proxies-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 @@ -494,11 +482,7 @@ spec: - name: SONAR_CE_JAVAOPTS value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8001:/opt/sonarqube/conf/prometheus-ce-config.yaml - name: inject-prometheus-exporter -<<<<<<< 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 @@ -540,11 +524,7 @@ spec: - name: SONAR_CE_JAVAOPTS value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8001:/opt/sonarqube/conf/prometheus-ce-config.yaml - name: install-plugins -<<<<<<< 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_plugins.sh"] securityContext: @@ -588,11 +568,7 @@ spec: value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8001:/opt/sonarqube/conf/prometheus-ce-config.yaml 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 @@ -753,11 +729,7 @@ spec: automountServiceAccountToken: false containers: - name: proxies-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/pvc-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/pvc-values.yaml index 754ba646f..2fd137614 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/pvc-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/pvc-values.yaml @@ -423,11 +423,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: pvc-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 @@ -453,11 +449,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 @@ -473,11 +465,7 @@ spec: command: ["/bin/bash", "-c"] args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/pvc-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 @@ -495,11 +483,7 @@ spec: - name: SONAR_CE_JAVAOPTS value: "" - name: init-fs -<<<<<<< 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: capabilities: @@ -534,11 +518,7 @@ spec: subPath: extensions 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 @@ -675,11 +655,7 @@ spec: automountServiceAccountToken: false containers: - name: pvc-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/secret-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/secret-values.yaml index 761cc49b9..32b490ea3 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/secret-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/secret-values.yaml @@ -184,11 +184,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: secret-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 @@ -213,11 +209,7 @@ spec: fsGroup: 0 initContainers: - 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 @@ -236,11 +228,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 @@ -371,11 +359,7 @@ spec: automountServiceAccountToken: false containers: - name: secret-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/service-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/service-values.yaml index cf89be9cc..c9f350dd6 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/service-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/service-values.yaml @@ -395,11 +395,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: service-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 @@ -424,11 +420,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 @@ -444,11 +436,7 @@ spec: command: ["/bin/bash", "-c"] args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/service-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 @@ -467,11 +455,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 @@ -602,11 +586,7 @@ spec: automountServiceAccountToken: false containers: - name: service-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/serviceaccount-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/serviceaccount-values.yaml index 25c1a1e6c..81895fc30 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/serviceaccount-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/serviceaccount-values.yaml @@ -402,11 +402,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: serviceaccount-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/serviceaccount-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: serviceaccount-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/sonar-web-context-deployment-deprecated-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/sonar-web-context-deployment-deprecated-values.yaml index 7a08542c0..ec8de0740 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/sonar-web-context-deployment-deprecated-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/sonar-web-context-deployment-deprecated-values.yaml @@ -241,11 +241,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: sonar-web-context-deployment-deprecated-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 @@ -271,11 +267,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 @@ -291,11 +283,7 @@ spec: command: ["/bin/bash", "-c"] args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/sonar-web-context-deployment-deprecated-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 @@ -314,11 +302,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 @@ -633,11 +617,7 @@ spec: automountServiceAccountToken: false containers: - name: sonar-web-context-deployment-deprecated-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: [ @@ -687,11 +667,7 @@ spec: serviceAccountName: default containers: - name: sonar-web-context-deployment-deprecated-values.yaml-sonarqube-change-default-admin-password -<<<<<<< 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 securityContext: allowPrivilegeEscalation: false capabilities: diff --git a/tests/unit-compatibility-test/fixtures/sonarqube/sonar-web-context-sts-deprecated-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/sonar-web-context-sts-deprecated-values.yaml index 9c436a307..a76b65171 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/sonar-web-context-sts-deprecated-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/sonar-web-context-sts-deprecated-values.yaml @@ -402,11 +402,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: sonar-web-context-sts-deprecated-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/sonar-web-context-sts-deprecated-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 @@ -632,11 +616,7 @@ spec: automountServiceAccountToken: false containers: - name: sonar-web-context-sts-deprecated-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: [ @@ -686,11 +666,7 @@ spec: serviceAccountName: default containers: - name: sonar-web-context-sts-deprecated-values.yaml-sonarqube-change-default-admin-password -<<<<<<< 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 securityContext: allowPrivilegeEscalation: false capabilities: diff --git a/tests/unit-compatibility-test/fixtures/sonarqube/sonar-web-context-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/sonar-web-context-values.yaml index 2011856bd..9030350b2 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/sonar-web-context-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/sonar-web-context-values.yaml @@ -402,11 +402,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: sonar-web-context-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/sonar-web-context-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 @@ -632,11 +616,7 @@ spec: automountServiceAccountToken: false containers: - name: sonar-web-context-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: [ @@ -686,11 +666,7 @@ spec: serviceAccountName: default containers: - name: sonar-web-context-values.yaml-sonarqube-change-default-admin-password -<<<<<<< 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 securityContext: allowPrivilegeEscalation: false capabilities: diff --git a/tests/unit-compatibility-test/fixtures/sonarqube/template-refactoring-values.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/template-refactoring-values.yaml index e05d1d47f..e563e5e04 100644 --- a/tests/unit-compatibility-test/fixtures/sonarqube/template-refactoring-values.yaml +++ b/tests/unit-compatibility-test/fixtures/sonarqube/template-refactoring-values.yaml @@ -421,11 +421,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/part-of: sonarqube app.kubernetes.io/component: template-refactoring-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 @@ -452,11 +448,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 @@ -476,11 +468,7 @@ spec: command: ["/bin/bash", "-c"] args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/template-refactoring-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 @@ -502,11 +490,7 @@ spec: - name: SONAR_CE_JAVAOPTS value: "" - name: init-fs -<<<<<<< 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: capabilities: @@ -545,11 +529,7 @@ spec: subPath: extensions 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 @@ -686,11 +666,7 @@ spec: automountServiceAccountToken: false containers: - name: template-refactoring-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: [