Merge branch 'branden.cobb-main-patch-77491' into 'main'

initContainers

Closes #2

See merge request !21

CHANGELOG.md

 # Changelog
 
+## 9.2.6-bb.6 - 2021-03-30
+
+Modified initContainer logic
+
 ## 9.2.6-bb.5 - 2021-03-22
 
 Fixed initContainer logic

chart/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 8.6-community
 name: sonarqube
 description: SonarQube is an open sourced code quality scanning tool
-version: 9.2.6-bb.5
+version: 9.2.6-bb.6
 keywords:
   - coverage
   - security

chart/templates/deployment.yaml

@@ -58,6 +58,7 @@ spec:
       imagePullSecrets:
         - name: {{ .Values.image.pullSecret }}
       {{- end }}
+      {{- if or .Values.caCerts .Values.initSysctl.enabled .Values.elasticsearch.configureNode .Values.plugins.install .Values.postgresql.enabled (and .Values.sonarProperties .Values.sonarSecretProperties) }}
       initContainers:
       {{- if .Values.caCerts }}
         - name: ca-certs
@@ -172,6 +173,7 @@ spec:
           - name: POSTGRES_HOST_AUTH_METHOD
             value: "trust"      
       {{- end }} 
+      {{- end }}
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName }}
       {{- end }}