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
575176d
..
dee73ba
100644
(file)
--- a/
kubernetes/sdc/templates/configmap.yaml
+++ b/
kubernetes/sdc/templates/configmap.yaml
@@
-1,4
+1,6
@@
+{{/*
# Copyright © 2017 Amdocs, AT&T, Bell Canada
# Copyright © 2017 Amdocs, AT&T, Bell Canada
+# Modifications Copyright © 2018 ZTE
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-11,19
+13,32
@@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+*/}}
apiVersion: v1
kind: ConfigMap
metadata:
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{
.Release.Name
}}-sdc-environments-configmap
+ name: {{
include "common.release" .
}}-sdc-environments-configmap
namespace: {{ include "common.namespace" . }}
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ include "common.release" . }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/environments/*").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: ConfigMap
metadata:
data:
{{ tpl (.Files.Glob "resources/config/environments/*").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{
.Release.Name }}-sdc-filebeat-configmap
+ name: {{
include "common.release" . }}-sdc-cqlshrc
namespace: {{ include "common.namespace" . }}
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ include "common.release" . }}
+ heritage: {{ .Release.Service }}
data:
data:
-{{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/cqlshrc").AsConfig . | indent 2 }}
+---
+{{ include "common.log.configMap" . }}