UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 9cd9360f authored by Micah Nagel's avatar Micah Nagel
Browse files

Merge branch 'Minio_Bring_Back_Passing_Annotation_In_Tenant_Chart' into 'master'

Pass Istio Annotations To Minio Charts

Closes platform-one/big-bang/apps/application-utilities/minio#22, platform-one/big-bang/apps/collaboration-tools/mattermost#43, and platform-one/big-bang/apps/sandbox/vault#12

See merge request platform-one/big-bang/bigbang!1355
parents e4894724 7e2c369f
No related branches found
No related tags found
3 merge requests!1658Draft: Merge branch 'tempo_tracing_updates' into 'master',!1386Master,!1355Pass Istio Annotations To Minio Charts
Pipeline #691636 passed
......@@ -56,4 +56,10 @@ istio:
vault:
gateways:
- istio-system/{{ default "public" .Values.addons.vault.ingress.gateway }}
minio:
{{- if .Values.istio.enabled }}
annotations:
{{ include "istioAnnotation" . }}
{{- end }}
{{- end -}}
......@@ -661,7 +661,7 @@ addons:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio.git
path: "./chart"
tag: "4.4.3-bb.2"
tag: "4.4.3-bb.3"
# -- Flux reconciliation overrides specifically for the Minio Package
flux: {}
......@@ -1044,7 +1044,7 @@ addons:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost.git
path: "./chart"
tag: "0.4.0-bb.3"
tag: "0.4.0-bb.4"
# -- Flux reconciliation overrides specifically for the Mattermost Package
flux: {}
......@@ -1217,7 +1217,7 @@ addons:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/vault.git
path: "./chart"
tag: "0.18.0-bb.6"
tag: "0.18.0-bb.7"
# -- Flux reconciliation overrides specifically for the Vault 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