X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Fcomponents%2Faai-modelloader%2Ftemplates%2Fdeployment.yaml;h=8dee92f77eecc18573c8bdd6ac6b056b516b9ca6;hb=refs%2Fheads%2Fmaster;hp=78dd307b9f9efa302f0a4adbb676b4f72649db0d;hpb=ceac26096eeda210db046686494fdf11afbf0ab8;p=oom.git

diff --git a/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml b/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml
index 78dd307b9f..8dee92f77e 100644
--- a/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml
@@ -26,9 +26,9 @@ metadata:
     app: {{ include "common.name" . }}
     app.kubernetes.io/name: {{ include "common.name" . }}
     {{- if .Chart.AppVersion }}
-    version: {{ .Chart.AppVersion | replace "+" "_" }}
+    version: "{{ .Chart.AppVersion | replace "+" "_" }}"
     {{- else }}
-    version: {{ .Chart.Version | replace "+" "_" }}
+    version: "{{ .Chart.Version | replace "+" "_" }}"
     {{- end }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ include "common.release" . }}
@@ -52,9 +52,9 @@ spec:
         release: {{ include "common.release" . }}
         app.kubernetes.io/name: {{ include "common.name" . }}
         {{- if .Chart.AppVersion }}
-        version: {{ .Chart.AppVersion | replace "+" "_" }}
+        version: "{{ .Chart.AppVersion | replace "+" "_" }}"
         {{- else }}
-        version: {{ .Chart.Version | replace "+" "_" }}
+        version: "{{ .Chart.Version | replace "+" "_" }}"
         {{- end }}
       name: {{ include "common.name" . }}
     spec:
@@ -77,12 +77,12 @@ spec:
               name: {{ include "common.name" . }}-ku
               key: sasl.jaas.config
         volumeMounts:
-        - mountPath: /etc/localtime
-          name: localtime
-          readOnly: true
         - mountPath: /opt/app/model-loader/config/model-loader.properties
           subPath: model-loader.properties
           name: prop-config
+        - mountPath: /opt/app/model-loader/application.properties
+          subPath: application.properties
+          name: prop-config
         - mountPath: {{ .Values.log.path }}
           name: logs
         - mountPath: /opt/app/model-loader/logback.xml
@@ -93,9 +93,6 @@ spec:
         {{ include "common.log.sidecar" . | nindent 6 }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
-      - name: localtime
-        hostPath:
-          path: /etc/localtime
       - name: prop-config
         configMap:
           name: {{ include "common.fullname" . }}-prop
@@ -106,5 +103,4 @@ spec:
         configMap:
           name: {{ include "common.fullname" . }}-log
       restartPolicy: {{ .Values.global.restartPolicy | default .Values.restartPolicy }}
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
+      {{- include "common.imagePullSecrets" . | nindent 6 }}