Refactor initFs logic

SonarSource · Oct 4, 2024 · c799580 · c799580
1 parent bc1bbe4
commit c799580
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/charts/sonarqube/templates/init-fs.yaml b/charts/sonarqube/templates/init-fs.yaml
@@ -9,11 +9,8 @@ data:
     chown -R {{ .Values.persistence.uid }}:{{ .Values.persistence.guid }} {{ .Values.sonarqubeFolder }}/data
     chown -R {{ .Values.persistence.uid }}:{{ .Values.persistence.guid }} {{ .Values.sonarqubeFolder }}/temp
     chown -R {{ .Values.persistence.uid }}:{{ .Values.persistence.guid }} {{ .Values.sonarqubeFolder }}/logs
-    {{- if .Values.plugins.install }}
-    chown -R {{ .Values.persistence.uid }}:{{ .Values.persistence.guid }} {{ .Values.sonarqubeFolder }}/extensions/plugins
-    {{- end }}
-    {{- if .Values.jdbcOverwrite.oracleJdbcDriverURL }}
-    chown -R {{ .Values.persistence.uid }}:{{ .Values.persistence.guid }} {{ .Values.sonarqubeFolder }}/extensions/jdbc-driver/oracle
+    {{- if or .Values.plugins.install .Values.jdbcOverwrite.oracleJdbcDriverURL }}
+    chown -R {{ .Values.persistence.uid }}:{{ .Values.persistence.guid }} {{ .Values.sonarqubeFolder }}/extensions
     {{- end }}
     {{- if .Values.caCerts.enabled }}
     chown -R {{ .Values.persistence.uid }}:{{ .Values.persistence.guid }} {{ .Values.sonarqubeFolder }}/certs

diff --git a/tests/unit-compatibility-test/fixtures/sonarqube-dce/ca-certificates-configmap.yaml b/tests/unit-compatibility-test/fixtures/sonarqube-dce/ca-certificates-configmap.yaml
@@ -179,7 +179,7 @@ metadata:
   name: ca-certificates-configmap.yaml-sonarqube-dce-install-oracle-jdbc-driver
   labels:
     app: sonarqube-dce
-    chart: sonarqube-dce-10.7.0
+    chart: sonarqube-dce-10.8.0
     release: ca-certificates-configmap.yaml
     heritage: Helm
 data:
@@ -450,7 +450,7 @@ spec:
             - mountPath: /tmp/secrets/ca-certs
               name: ca-certs
         - name: install-oracle-jdbc-driver
-          image: sonarqube:10.6.0-datacenter-app
+          image: sonarqube:10.7.0-datacenter-app
           imagePullPolicy: IfNotPresent
           command: ["sh", "-e", "/tmp/scripts/install_oracle_jdbc_driver.sh"]
           securityContext:

diff --git a/tests/unit-compatibility-test/fixtures/sonarqube/ca-certificates-configmap.yaml b/tests/unit-compatibility-test/fixtures/sonarqube/ca-certificates-configmap.yaml
@@ -114,7 +114,7 @@ metadata:
   name: ca-certificates-configmap.yaml-sonarqube-install-oracle-jdbc-driver
   labels:
     app: sonarqube
-    chart: sonarqube-10.7.0
+    chart: sonarqube-10.8.0
     release: ca-certificates-configmap.yaml
     heritage: Helm
 data:
@@ -489,7 +489,7 @@ spec:
             - name: SONAR_CE_JAVAOPTS
               value: -Djavax.net.ssl.trustStore=/opt/sonarqube/certs/cacerts
         - name: install-oracle-jdbc-driver
-          image: sonarqube:10.6.0-community
+          image: sonarqube:10.7.0-community
           imagePullPolicy: IfNotPresent
           command: ["sh", "-e", "/tmp/scripts/install_oracle_jdbc_driver.sh"]
           securityContext: