UNCLASSIFIED - NO CUI

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

Merge branch 'annotate-istio-minio-operator' into 'master'

add istio annotation for minio operator

Closes #975

See merge request platform-one/big-bang/bigbang!1197
parents f84a5256 0cb149c8
No related branches found
No related tags found
2 merge requests!1386Master,!1197add istio annotation for minio operator
Pipeline #640470 passed
...@@ -22,7 +22,11 @@ networkPolicies: ...@@ -22,7 +22,11 @@ networkPolicies:
istio: istio:
enabled: {{ .Values.istio.enabled }} enabled: {{ .Values.istio.enabled }}
{{- if .Values.istio.enabled }}
annotations:
{{ include "istioAnnotation" . }}
{{- end }}
monitoring: monitoring:
enabled: {{ .Values.monitoring.enabled }} enabled: {{ .Values.monitoring.enabled }}
{{- end -}} {{- end -}}
...@@ -620,7 +620,7 @@ addons: ...@@ -620,7 +620,7 @@ addons:
git: git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio-operator.git repo: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio-operator.git
path: "./chart" path: "./chart"
tag: "4.2.3-bb.2" tag: "4.2.3-bb.4"
# -- Flux reconciliation overrides specifically for the Minio Operator Package # -- Flux reconciliation overrides specifically for the Minio Operator Package
flux: {} 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