X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fconfig%2Ftemplates%2Fpod.yaml;h=93c64ab3dd66125156ab7a3d9be8b1c0065df572;hb=70863e11b3d0816ad7b8f938fe60eb293b2748db;hp=c9bf7a907cfc4559b57c58489e05f88243008fc4;hpb=063a3ce97495362035652721b3e626d6ab60c31c;p=oom.git

diff --git a/kubernetes/config/templates/pod.yaml b/kubernetes/config/templates/pod.yaml
index c9bf7a907c..93c64ab3dd 100644
--- a/kubernetes/config/templates/pod.yaml
+++ b/kubernetes/config/templates/pod.yaml
@@ -1,10 +1,24 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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:
   name: global-onap-configmap
   namespace: "{{ .Values.nsPrefix }}"
 data:
-  {{ (.Files.Glob "onap-parameters.yaml").AsConfig | indent 2 }}
+{{ .Files.Get "onap-parameters.yaml" | indent 2 }}
 ---
 apiVersion: v1
 kind: Pod
@@ -14,7 +28,7 @@ metadata:
 spec:
   containers:
     - name: {{ .Chart.Name }}
-      image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+      image: "{{ .Values.image.repository }}"
       imagePullPolicy: {{ .Values.image.pullPolicy }}
       envFrom:
         - configMapRef:
@@ -25,7 +39,7 @@ spec:
           fieldRef:
             fieldPath: metadata.namespace
       - name: NAMESPACE_PREFIX
-        value: {{ .Values.nsPrefix }}            
+        value: {{ .Values.nsPrefix }}
       - name: DOCKER_SHARE_PATH
         value: {{ .Values.dockerSharePath }}
       volumeMounts:
@@ -35,4 +49,4 @@ spec:
     - name: config-init-root
       hostPath:
         path: {{ .Values.dockerSharePath }}
-  restartPolicy: Never
\ No newline at end of file
+  restartPolicy: Never