fixed blocking conditional for additional ca-certificates (#88)

charts/sonarqube/CHANGELOG.md

@@ -1,6 +1,8 @@
 # SonarQube Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [1.1.2]
+* fixed condition check to add new certificates
 
 ## [1.1.1]
 * updated default application version to 9.0.1

charts/sonarqube/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: sonarqube
 description: SonarQube offers Code Quality and Code Security analysis for up to 27 languages. Find Bugs, Vulnerabilities, Security Hotspots and Code Smells throughout your workflow.
-version: 1.1.1
+version: 1.1.2
 appVersion: 9.0.1
 keywords:
   - coverage
@@ -18,91 +18,8 @@ maintainers:
     email: tobias.trabelsi+helm@sonarsource.com
 annotations:
   artifacthub.io/changes: |
-    - kind: changed
-      description: updated application version to 9.0.1
-    - kind: changed
-      description: Helm charts repository moved to a new location
-      links:
-        - name: New location
-          url: https://sonarsource.github.io/helm-chart-sonarqube/
-    - kind: changed
-      description: update jdbc overwrite values
-    - kind: changed
-      description: replace `jdbcUrlOverride` with `jdbcOverwrite.jdbcUrl`
     - kind: fixed
-      description: remove useless `jdbcDatabaseType` (was always postgres)
-    - kind: deprecated
-      description: deprecate `postgresql.postgresqlServer`, `postgresql.existingSecret` and `postgresql.existingSecretPasswordKey` in favor of new `jdbcOverwrite` values
-    - kind: changed
-      description: update dependency Charts
-    - kind: added
-      description: Add optional ingress parameter `ingressClassName`
-    - kind: added
-      description: added route support for OpenShift deployments
-    - kind: added
-      description: Add an additional configuration parameter `extraContainers` to allow an array of containers to run alongside the sonarqube container
-    - kind: fixed
-      description: fixed usage of `sonarSecretProperties`
-    - kind: changed
-      description: bump jmx_exporter to 0.16.0
-    - kind: added
-      description: added hostAliases to deploymentType statefulset
-    - kind: changed
-      description: made prometheus exporter port configurable and support prometheus PodMonitor
-    - kind: changed
-      description: make sure SQ is restarted when the JMX Prometheus exporter agents configuration changes
-    - kind: changed
-      description: JMX Prometheus exporter agent is now also enabled on the CE process
-    - kind: added
-      description: `prometheusExporter.ceConfig` allows specific config of the JMX Prometheus exporter agent for the CE process
-    - kind: added
-      description: added prometheusExporter.noCheckCertificate option
-    - kind: fixed
-      description: add missing imagePullSecrets in sts install type
-    - kind: fixed
-      description: fix typo in initfs
-    - kind: fixed
-      description: fix plugin installation init container permissions
-    - kind: fixed
-      description: fix duplicated mount point for conf when sonar.properties are defined
-    - kind: fixed
-      description: fix invalid yaml render in `secret.yaml` when using external postgresql
-    - kind: added
-      description: added `prometheusExporter.downloadURL` (custom download URL for the agent jar)
-    - kind: changed
-      description:  replace `rjkernick/alpine-wget` with `curlimages/curl`
-    - kind: changed
-      description: update `install-plugins` script
-    - kind: fixed
-      description: fix possible issue with prometheus init container and `env` set in the `values.yaml`
-    - kind: fixed
-      description: fix for missing `serviceAccountName` in STS deployment kind
-    - kind: fixed
-      description: fixed prometheus config volume mount if disabled
-    - kind: changed
-      description: switched from wget to curl image per default for downloading agent
-    - kind: added
-      description: added support for proxy envs
-    - kind: added
-      description: added option to configure CE java opts separately
-    - kind: fixed
-      description: fixed missing conditional that was introduced in 0.9.2.2 to sonarqube-sts.yaml
-    - kind: changed
-      description: updated default application version to 8.9
-    - kind: changed
-      description: changed default deployment from replica set to statefull set
-    - kind: added
-      description: added default support for prometheus jmx exporter
-    - kind: added
-      description: added init filesystem container
-    - kind: added
-      description: added nginx-ingress as optional dependency
-    - kind: changed
-      description: updated application version to 8.8-community
-    - kind: changed
-      description: improved readiness/startup and liveness probes
-    - kind: changed
-      description: improved documentation
+      description: fixed condition check to add new certificates
   artifacthub.io/containsSecurityUpdates: "false"
   artifacthub.io/images: |
     - name: sonarqube

charts/sonarqube/templates/sonarqube-sts.yaml

@@ -61,7 +61,6 @@ spec:
 {{ toYaml .Values.initContainers.resources | indent 12 }}
           command: ["/bin/sh", "-c", "for i in $(seq 1 200); do nc -z -w3 {{ .Release.Name}}-postgresql 5432 && exit 0 || sleep 2; done; exit 1"]
       {{- end }}
-      {{- if or .Values.initSysctl.enabled .Values.elasticsearch.configureNode }}
       {{- if .Values.caCerts }}
         - name: ca-certs
           image: {{ default "adoptopenjdk/openjdk11:alpine" .Values.caCerts.image }}
@@ -85,6 +84,7 @@ spec:
             {{- . | toYaml | trim | nindent 12 }}
           {{- end }}
       {{- end }}
+      {{- if or .Values.initSysctl.enabled .Values.elasticsearch.configureNode }}
         - name: init-sysctl
           image: {{ default "busybox:1.32" .Values.initSysctl.image }}
           imagePullPolicy: {{ .Values.image.pullPolicy  }}