Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Added properties to so vnfm adapter
[oom.git]
/
kubernetes
/
so
/
templates
/
configmap.yaml
diff --git
a/kubernetes/so/templates/configmap.yaml
b/kubernetes/so/templates/configmap.yaml
old mode 100644
(file)
new mode 100755
(executable)
index
db83fbb
..
b94f35f
--- a/
kubernetes/so/templates/configmap.yaml
+++ b/
kubernetes/so/templates/configmap.yaml
@@
-1,4
+1,4
@@
-# Copyright © 201
7 Amdocs, Bell Canada
+# Copyright © 201
8 AT&T USA
#
# 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
+11,29
@@
# 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
apiVersion: v1
+data:
+ LOG_PATH: {{ index .Values.logPath }}
+ APP: {{ index .Values.app }}
kind: ConfigMap
metadata:
kind: ConfigMap
metadata:
- name:
so
-configmap
+ name:
{{ include "common.fullname" . }}
-configmap
namespace: {{ include "common.namespace" . }}
namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/mso/*").AsConfig . | indent 2 }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
---
apiVersion: v1
kind: ConfigMap
metadata:
---
apiVersion: v1
kind: ConfigMap
metadata:
- name:
so-docker-file
-configmap
+ name:
{{ include "common.fullname" . }}-app
-configmap
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/
docker-files/scripts/start-jboss-server.sh
").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/
overrides/*
").AsConfig . | indent 2 }}