UNCLASSIFIED - NO CUI

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

Merge branch 'update-sonarqube-tag-10.6.1-bb.2' into 'master'

sonarqube update to 10.6.1-bb.2

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

See merge request !5243
parents 8a76cb3b ccd5bda1
No related branches found
No related tags found
1 merge request!5243sonarqube update to 10.6.1-bb.2
Pipeline #3672380 passed
......@@ -18,12 +18,6 @@ podAnnotations:
{{ include "istioAnnotation" . }}
{{- end }}
{{- if .Values.kiali.enabled }}
podLabels:
{{- include "kialiAppLabel" . | nindent 2 }}
{{- include "kialiVersionLabel" . | nindent 2 }}
{{- end }}
openshift: {{ .Values.openshift }}
istio:
......
......@@ -83,11 +83,6 @@ kibana:
podAnnotations:
{{ include "istioAnnotation" . }}
{{- end }}
{{- if .Values.kiali.enabled }}
podLabels:
{{- include "kialiAppLabel" . | nindent 4 }}
{{- include "kialiVersionLabel" . | nindent 4 }}
{{- end }}
{{- if not .Values.elasticsearchKibana.serviceAccountAnnotations.kibana }}
serviceAccountAnnotations: {}
......@@ -99,10 +94,6 @@ monitoring:
metrics:
enabled: {{ .Values.monitoring.enabled }}
{{- if .Values.kiali.enabled }}
podLabels:
{{- include "kialiVersionLabel" . | nindent 4 }}
{{- end }}
{{- $istioInjection := (and (eq (dig "istio" "injection" "enabled" .Values.elasticsearchKibana) "enabled") .Values.istio.enabled) }}
{{- if and (eq (dig "istio" "mtls" "mode" "STRICT" .Values.elasticsearchKibana.values) "STRICT") $istioInjection }}
serviceMonitor:
......@@ -118,11 +109,6 @@ elasticsearch:
imagePullSecrets:
- name: private-registry
master:
{{- if .Values.kiali.enabled }}
podLabels:
{{- include "kialiAppLabel" . | nindent 6 }}
{{- include "kialiVersionLabel" . | nindent 6 }}
{{- end }}
initContainers:
- name: elastic-internal-init-filesystem
securityContext:
......@@ -149,11 +135,6 @@ elasticsearch:
{{ include "istioAnnotation" . }}
{{- end }}
data:
{{- if .Values.kiali.enabled }}
podLabels:
{{- include "kialiAppLabel" . | nindent 6 }}
{{- include "kialiVersionLabel" . | nindent 6 }}
{{- end }}
initContainers:
- name: elastic-internal-init-filesystem
securityContext:
......@@ -180,11 +161,6 @@ elasticsearch:
{{ include "istioAnnotation" . }}
{{- end }}
ingest:
{{- if .Values.kiali.enabled }}
podLabels:
{{- include "kialiAppLabel" . | nindent 6 }}
{{- include "kialiVersionLabel" . | nindent 6 }}
{{- end }}
initContainers:
- name: elastic-internal-init-filesystem
securityContext:
......@@ -211,11 +187,6 @@ elasticsearch:
{{ include "istioAnnotation" . }}
{{- end }}
ml:
{{- if .Values.kiali.enabled }}
podLabels:
{{- include "kialiAppLabel" . | nindent 6 }}
{{- include "kialiVersionLabel" . | nindent 6 }}
{{- end }}
initContainers:
- name: elastic-internal-init-filesystem
securityContext:
......@@ -242,11 +213,6 @@ elasticsearch:
{{ include "istioAnnotation" . }}
{{- end }}
coord:
{{- if .Values.kiali.enabled }}
podLabels:
{{- include "kialiAppLabel" . | nindent 6 }}
{{- include "kialiVersionLabel" . | nindent 6 }}
{{- end }}
initContainers:
- name: elastic-internal-init-filesystem
securityContext:
......
......@@ -101,11 +101,5 @@ postgresql:
port: {{ .port }}
{{- end }}
{{- end }}
{{- if .Values.kiali.enabled }}
podLabels:
{{- include "kialiVersionLabel" . | nindent 2 }}
{{- end }}
{{- end -}}
......@@ -1398,11 +1398,11 @@ addons:
git:
repo: https://repo1.dso.mil/big-bang/product/packages/sonarqube.git
path: "./chart"
tag: "10.6.1-bb.1"
tag: "10.6.1-bb.2"
helmRepo:
repoName: "registry1"
chartName: "sonarqube"
tag: "10.6.1-bb.1"
tag: "10.6.1-bb.2"
# -- 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