UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 7abfbdb8 authored by Michael Martin's avatar Michael Martin
Browse files

Merge branch 'update-sonarqube-tag-10.7.0-bb.1' into 'master'

sonarqube update to 10.7.0-bb.1

Closes big-bang/product/packages/sonarqube#163

See merge request !5948
parents c07f2bbf e61a54f6
No related branches found
No related tags found
1 merge request!5948sonarqube update to 10.7.0-bb.1
Pipeline #4054739 passed
......@@ -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 }}
......
......@@ -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 }}
......@@ -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:
......
......@@ -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: {}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment