Merge branch 'brandtkeller-sonarqube-1065' into 'master'

Sonarqube openshift value propagation / SAML group name fix

Closes #1072 and #1065

See merge request platform-one/big-bang/bigbang!1348

chart/templates/sonarqube/values.yaml

@@ -10,6 +10,9 @@ domain: {{ $domainName }}
 # Define variables to help with conditionals later
 {{- $istioInjection := (and (eq (dig "istio" "injection" "enabled" .Values.addons.sonarqube) "enabled") .Values.istio.enabled) }}
 
+openshift:
+  enabled: {{ .Values.openshift }}
+
 istio:
   enabled: {{ .Values.istio.enabled }}
   sonarqube:
@@ -49,7 +52,7 @@ sonarProperties:
   sonar.auth.saml.user.name: {{ .Values.addons.sonarqube.sso.name | default "name" }}
   sonar.auth.saml.user.email: {{ .Values.addons.sonarqube.sso.email | default "email" }}
   {{- if .Values.addons.sonarqube.sso.group }}
-  sonar.auth.saml.user.group: {{ .Values.addons.sonarqube.sso.group }}
+  sonar.auth.saml.group.name: {{ .Values.addons.sonarqube.sso.group }}
   {{- end }}
 {{- end }}