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 "[STRIMZI] Solve Security Policy violations"
[oom.git]
/
kubernetes
/
sdc
/
templates
/
configmap.yaml
diff --git
a/kubernetes/sdc/templates/configmap.yaml
b/kubernetes/sdc/templates/configmap.yaml
index
fbb0b42
..
dee73ba
100644
(file)
--- a/
kubernetes/sdc/templates/configmap.yaml
+++ b/
kubernetes/sdc/templates/configmap.yaml
@@
-31,7
+31,7
@@
data:
apiVersion: v1
kind: ConfigMap
metadata:
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.release" . }}-sdc-
filebeat-configmap
+ name: {{ include "common.release" . }}-sdc-
cqlshrc
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@
-39,4
+39,6
@@
metadata:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
-{{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/cqlshrc").AsConfig . | indent 2 }}
+---
+{{ include "common.log.configMap" . }}