UNCLASSIFIED - NO CUI

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

Merge remote-tracking branch 'origin/master' into authservice-fix-istio-egress

parents a89989f9 1ea6b3c5
No related branches found
No related tags found
1 merge request!2967new authservice package to fix istio egress NP
Pipeline #2066961 passed with warnings
......@@ -243,18 +243,18 @@ grafana.ini:
role_attribute_path: {{ .Values.grafana.sso.grafana.role_attribute_path | default "Viewer" }}
{{- end }}
{{- with .Values.grafana.sso.grafana }}
{{- list "allowed_domains" .allowed_domains | include "bigbang.addValueIfSet" | indent 6 }}
{{- list "tls_client_ca" .tls_client_ca | include "bigbang.addValueIfSet" | indent 6 }}
{{- list "tls_skip_verify_insecure" .tls_skip_verify_insecure | include "bigbang.addValueIfSet" | indent 6 }}
{{- list "tls_client_cert" .tls_client_cert | include "bigbang.addValueIfSet" | indent 6 }}
{{- list "tls_client_key" .tls_client_key | include "bigbang.addValueIfSet" | indent 6 }}
{{- list "allowed_domains" .allowed_domains | include "bigbang.addValueIfSet" | indent 4 }}
{{- list "tls_client_ca" .tls_client_ca | include "bigbang.addValueIfSet" | indent 4 }}
{{- list "tls_skip_verify_insecure" .tls_skip_verify_insecure | include "bigbang.addValueIfSet" | indent 4 }}
{{- list "tls_client_cert" .tls_client_cert | include "bigbang.addValueIfSet" | indent 4 }}
{{- list "tls_client_key" .tls_client_key | include "bigbang.addValueIfSet" | indent 4 }}
{{- end }}
{{- with .Values.monitoring.sso.grafana }}
{{- list "allowed_domains" .allowed_domains | include "bigbang.addValueIfSet" | indent 6 }}
{{- list "tls_client_ca" .tls_client_ca | include "bigbang.addValueIfSet" | indent 6 }}
{{- list "tls_skip_verify_insecure" .tls_skip_verify_insecure | include "bigbang.addValueIfSet" | indent 6 }}
{{- list "tls_client_cert" .tls_client_cert | include "bigbang.addValueIfSet" | indent 6 }}
{{- list "tls_client_key" .tls_client_key | include "bigbang.addValueIfSet" | indent 6 }}
{{- list "allowed_domains" .allowed_domains | include "bigbang.addValueIfSet" | indent 4 }}
{{- list "tls_client_ca" .tls_client_ca | include "bigbang.addValueIfSet" | indent 4 }}
{{- list "tls_skip_verify_insecure" .tls_skip_verify_insecure | include "bigbang.addValueIfSet" | indent 4 }}
{{- list "tls_client_cert" .tls_client_cert | include "bigbang.addValueIfSet" | indent 4 }}
{{- list "tls_client_key" .tls_client_key | include "bigbang.addValueIfSet" | indent 4 }}
{{- end }}
{{- if and (or .Values.grafana.sso.grafana.client_id (dig "grafana" "client_id" false .Values.monitoring.sso)) (or .Values.sso.certificate_authority (dig "certificateAuthority" "cert" false .Values.sso)) }}
......
......@@ -490,11 +490,11 @@ kyvernoPolicies:
git:
repo: https://repo1.dso.mil/big-bang/product/packages/kyverno-policies.git
path: ./chart
tag: "1.1.0-bb.8"
tag: "1.1.0-bb.9"
helmRepo:
repoName: "registry1"
chartName: "kyverno-policies"
tag: "1.1.0-bb.8"
tag: "1.1.0-bb.9"
# -- Flux reconciliation overrides specifically for the Kyverno Package
flux: {}
......@@ -671,11 +671,11 @@ loki:
git:
repo: https://repo1.dso.mil/big-bang/product/packages/loki.git
path: "./chart"
tag: "5.8.9-bb.0"
tag: "5.9.2-bb.0"
helmRepo:
repoName: "registry1"
chartName: "loki"
tag: "5.8.9-bb.0"
tag: "5.9.2-bb.0"
# -- Flux reconciliation overrides specifically for the Loki Package
flux: {}
......@@ -724,11 +724,11 @@ neuvector:
git:
repo: https://repo1.dso.mil/big-bang/product/packages/neuvector.git
path: "./chart"
tag: "2.4.5-bb.0"
tag: "2.4.5-bb.2"
helmRepo:
repoName: "registry1"
chartName: "neuvector"
tag: "2.4.5-bb.0"
tag: "2.4.5-bb.2"
# -- Redirect the package ingress to a specific Istio Gateway (listed in `istio.gateways`). The default is "public".
ingress:
......@@ -1144,11 +1144,11 @@ addons:
git:
repo: https://repo1.dso.mil/big-bang/product/packages/gitlab.git
path: "./chart"
tag: "7.1.2-bb.0"
tag: "7.2.0-bb.0"
helmRepo:
repoName: "registry1"
chartName: "gitlab"
tag: "7.1.2-bb.0"
tag: "7.2.0-bb.0"
# -- Flux reconciliation overrides specifically for the Gitlab 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