diff --git a/chart/templates/sonarqube/helmrelease.yaml b/chart/templates/sonarqube/helmrelease.yaml index 4d15d95de842c7c02a07b55770af2cc68862ba58..6642daec1c1907c36f1b861f3b2e3cb5386b38b4 100644 --- a/chart/templates/sonarqube/helmrelease.yaml +++ b/chart/templates/sonarqube/helmrelease.yaml @@ -58,7 +58,7 @@ spec: values: - {{- if or .Values.gatekeeper.enabled .Values.istio.enabled .Values.kyvernoPolicies.enabled .Values.monitoring.enabled }} + {{- if or .Values.gatekeeper.enabled .Values.kyvernoPolicies.enabled .Values.monitoring.enabled (eq (include "istioEnabled" .) "true") }} dependsOn: {{- if .Values.gatekeeper.enabled }} - name: gatekeeper @@ -68,6 +68,10 @@ spec: - name: istio namespace: {{ .Release.Namespace }} {{- end }} + {{- if .Values.istioCore.enabled }} + - name: istio-core + namespace: {{ .Release.Namespace }} + {{- end }} {{- if .Values.kyvernoPolicies.enabled }} - name: kyverno-policies namespace: {{ .Release.Namespace }} diff --git a/chart/templates/sonarqube/namespace.yaml b/chart/templates/sonarqube/namespace.yaml index c61b874ed2c6f80c45e839ab03112cf957828fd7..f7a93c427b503a66389e75e680cbe19acfd512ed 100644 --- a/chart/templates/sonarqube/namespace.yaml +++ b/chart/templates/sonarqube/namespace.yaml @@ -7,5 +7,5 @@ metadata: app.kubernetes.io/name: sonarqube app.kubernetes.io/component: "developer-tools" {{- include "commonLabels" . | nindent 4}} - istio-injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.addons.sonarqube) "enabled")) }} + istio-injection: {{ ternary "enabled" "disabled" (and (eq (include "istioEnabled" .) "true") (eq (dig "istio" "injection" "enabled" .Values.addons.sonarqube) "enabled")) }} {{- end }} diff --git a/chart/templates/sonarqube/values.yaml b/chart/templates/sonarqube/values.yaml index 93454f437693266f58fcab47127f9d5bb29a46e1..fbeb731f3d352588995ca16954d746e9acbbe316 100644 --- a/chart/templates/sonarqube/values.yaml +++ b/chart/templates/sonarqube/values.yaml @@ -8,13 +8,13 @@ domain: {{ $domainName }} # Define variables to help with conditionals later -{{- $istioInjection := (and (eq (dig "istio" "injection" "enabled" .Values.addons.sonarqube) "enabled") .Values.istio.enabled) }} +{{- $istioInjection := (and (eq (include "istioEnabled" .) "true") (eq (dig "istio" "injection" "enabled" .Values.addons.sonarqube) "enabled")) }} OpenShift: enabled: {{ .Values.openshift }} istio: - enabled: {{ .Values.istio.enabled }} + enabled: {{ include "istioEnabled" . }} hardened: enabled: {{ or (dig "istio" "hardened" "enabled" false .Values.addons.sonarqube.values) @@ -22,7 +22,7 @@ istio: }} sonarqube: gateways: - - istio-system/{{ default "public" .Values.addons.sonarqube.ingress.gateway }} + - {{ include "istioGatewayNamespace" . }}/{{ default (include "istioPublicGateway" . ) .Values.addons.sonarqube.ingress.gateway }} injection: {{ dig "istio" "injection" "enabled" .Values.addons.sonarqube }} monitoring: diff --git a/chart/values.yaml b/chart/values.yaml index 7e9ade9fcd2a53b08445e36013e37d3f49b84271..d8c6cb17c4d39f549570c9e461fd7819c3c26b3f 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1530,11 +1530,11 @@ addons: git: repo: https://repo1.dso.mil/big-bang/product/packages/sonarqube.git path: "./chart" - tag: "10.7.0-bb.0" + tag: "10.7.0-bb.1" helmRepo: repoName: "registry1" chartName: "sonarqube" - tag: "10.7.0-bb.0" + tag: "10.7.0-bb.1" # -- Flux reconciliation overrides specifically for the Sonarqube Package flux: {}