Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[AUTHENTICATION] Restructured keycloak and Oauth2-proxy"
[oom.git]
/
kubernetes
/
common
/
cassandra
/
templates
/
configmap.yaml
diff --git
a/kubernetes/common/cassandra/templates/configmap.yaml
b/kubernetes/common/cassandra/templates/configmap.yaml
index
ab08c82
..
5510986
100644
(file)
--- a/
kubernetes/common/cassandra/templates/configmap.yaml
+++ b/
kubernetes/common/cassandra/templates/configmap.yaml
@@
-1,3
+1,4
@@
+{{- if not .Values.global.cassandra.useOperator }}
{{- if .Values.configOverrides }}
apiVersion: v1
kind: ConfigMap
{{- if .Values.configOverrides }}
apiVersion: v1
kind: ConfigMap
@@
-25,3
+26,4
@@
metadata:
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/docker-entrypoint.sh").AsConfig . | indent 2 }}
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/docker-entrypoint.sh").AsConfig . | indent 2 }}
+{{- end }}
\ No newline at end of file