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 "Fix config file name for POMBA ND CNTXTB"
[oom.git]
/
kubernetes
/
sdnc
/
templates
/
configmap.yaml
diff --git
a/kubernetes/sdnc/templates/configmap.yaml
b/kubernetes/sdnc/templates/configmap.yaml
index
6f4ee22
..
4adf816
100644
(file)
--- a/
kubernetes/sdnc/templates/configmap.yaml
+++ b/
kubernetes/sdnc/templates/configmap.yaml
@@
-17,6
+17,11
@@
kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}-filebeat-configmap
namespace: {{ include "common.namespace" . }}
metadata:
name: {{ include "common.fullname" . }}-filebeat-configmap
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/log/filebeat/log4j/*").AsConfig . | indent 2 }}
---
data:
{{ tpl (.Files.Glob "resources/config/log/filebeat/log4j/*").AsConfig . | indent 2 }}
---
@@
-25,6
+30,11
@@
kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}-log-configmap
namespace: {{ include "common.namespace" . }}
metadata:
name: {{ include "common.fullname" . }}-log-configmap
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }}
---
data:
{{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }}
---
@@
-33,6
+43,11
@@
kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}-bin
namespace: {{ include "common.namespace" . }}
metadata:
name: {{ include "common.fullname" . }}-bin
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/bin/*").AsConfig . | indent 2 }}
---
data:
{{ tpl (.Files.Glob "resources/config/bin/*").AsConfig . | indent 2 }}
---
@@
-41,6
+56,11
@@
kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}-properties
namespace: {{ include "common.namespace" . }}
metadata:
name: {{ include "common.fullname" . }}-properties
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/conf/*").AsConfig . | indent 2 }}
---
data:
{{ tpl (.Files.Glob "resources/config/conf/*").AsConfig . | indent 2 }}
---
@@
-49,5
+69,10
@@
kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}-env
namespace: {{ include "common.namespace" . }}
metadata:
name: {{ include "common.fullname" . }}-env
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Get "resources/env.yaml") . | indent 2 }}
data:
{{ tpl (.Files.Get "resources/env.yaml") . | indent 2 }}