Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[DMAAP] Use log template
[oom.git]
/
kubernetes
/
dmaap
/
components
/
dmaap-dr-node
/
templates
/
configmap.yaml
diff --git
a/kubernetes/dmaap/components/dmaap-dr-node/templates/configmap.yaml
b/kubernetes/dmaap/components/dmaap-dr-node/templates/configmap.yaml
index
6739267
..
597da17
100644
(file)
--- a/
kubernetes/dmaap/components/dmaap-dr-node/templates/configmap.yaml
+++ b/
kubernetes/dmaap/components/dmaap-dr-node/templates/configmap.yaml
@@
-1,3
+1,4
@@
+{{/*
# Copyright © 2017 Amdocs, Bell Canada
#
# Licensed under the Apache License, Version 2.0 (the "License");
# Copyright © 2017 Amdocs, Bell Canada
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@
-11,37
+12,40
@@
# 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: {{ include "common.fullname" . }}-
node-props-
configmap
+ name: {{ include "common.fullname" . }}-configmap
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
heritage: {{ .Release.Service }}
data:
heritage: {{ .Release.Service }}
data:
-{{ tpl (.Files.Glob "resources/config/
node.properties
").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/
*
").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: ConfigMap
metadata:
---
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.fullname" . }}-
create-feed-configmap
+ name: {{ include "common.fullname" . }}-
log
namespace: {{ include "common.namespace" . }}
namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
- heritage: {{ .Release.Service }}
data:
data:
-{{ tpl (.Files.Glob "resources/config/
feeds/*
").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/
logback.xml
").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: ConfigMap
metadata:
---
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.fullname" . }}-
log
+ name: {{ include "common.fullname" . }}-
dbc-drnodes
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/logback.xml").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/dr_nodes/*.json").AsConfig . | indent 2 }}
+---
+{{ include "common.log.configMap" . }}