From c12eae0f22e8364bf644205f6cdc88e7461ccf8a Mon Sep 17 00:00:00 2001 From: "branden.cobb" Date: Mon, 22 Mar 2021 20:59:05 +0000 Subject: [PATCH 1/4] Update chart/values.yaml, chart/templates/bigbang/virtualservice.yaml, tests/test-values.yml files --- chart/templates/bigbang/virtualservice.yaml | 9 +++++++-- chart/values.yaml | 13 ++++++++++++- tests/test-values.yml | 1 - 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/chart/templates/bigbang/virtualservice.yaml b/chart/templates/bigbang/virtualservice.yaml index 341c0c5..5c907c1 100644 --- a/chart/templates/bigbang/virtualservice.yaml +++ b/chart/templates/bigbang/virtualservice.yaml @@ -6,14 +6,19 @@ metadata: name: {{ template "sonarqube.fullname" . }} namespace: {{ .Release.Namespace }} labels: + helm.sh/chart: {{ include "sonarqube.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/part-of: sonarqube spec: gateways: - - istio-system/main + {{- range .Values.istio.sonarqube.gateways }} + - {{ . }} + {{- end }} hosts: - - "sonarqube.{{ .Values.hostname }}" + {{- range .Values.istio.sonarqube.hosts }} + - {{ tpl . $}} + {{- end }} http: - route: - destination: diff --git a/chart/values.yaml b/chart/values.yaml index 969404e..285f5bf 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -354,8 +354,19 @@ extraConfig: terminationGracePeriodSeconds: 60 # Big Bang Additions +## Your FQDN will be ${ .Values.subdomain }.${ .Values.hostname } hostname: bigbang.dev istio: - enabled: true + # Toggle istio integration + enabled: false + sonarqube: + # Toggle vs creation + enabled: true + annotations: {} + labels: {} + gateways: + - istio-system/main + hosts: + - sonarqube.{{ .Values.hostname }} monitoring: enabled: false diff --git a/tests/test-values.yml b/tests/test-values.yml index d5d2b81..aaddc0c 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -3,4 +3,3 @@ image: istio: enabled: true - -- GitLab From 2f7c49c2773c7c337e0e8a0db5439bccb0c99af6 Mon Sep 17 00:00:00 2001 From: "branden.cobb" Date: Mon, 22 Mar 2021 21:00:58 +0000 Subject: [PATCH 2/4] Update _helpers.tpl --- chart/templates/_helpers.tpl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index 07d1193..8059ff8 100644 --- a/chart/templates/_helpers.tpl +++ b/chart/templates/_helpers.tpl @@ -60,3 +60,10 @@ false true {{- end -}} {{- end -}} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "sonarqube.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} -- GitLab From a0336b7213bb08cba63da0b2c07baef0c49300c1 Mon Sep 17 00:00:00 2001 From: "branden.cobb" Date: Mon, 22 Mar 2021 21:09:10 +0000 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a57aea2..e2393f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 9.2.6-bb.4 - 2021-03-22 + +Adding ability to specify istio gateways and hosts in values file + ## 9.2.6-bb.3 - 2021-03-16 Plugins have been preinstalled into the container and made available at registry.dso.mil. -- GitLab From 50ca2ed5f727f48819b1e540e5a766980549f4f8 Mon Sep 17 00:00:00 2001 From: "branden.cobb" Date: Mon, 22 Mar 2021 21:09:27 +0000 Subject: [PATCH 4/4] Update Chart.yaml --- chart/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 261b904..b06e400 100644 --- a/chart/Chart.yaml +++ b/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.3 +version: 9.2.6-bb.4 keywords: - coverage - security -- GitLab