Merge "[AAI] Make aai log level configurable"

[oom.git] / kubernetes / aai / components / aai-schema-service / templates / deployment.yaml

diff --git a/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml b/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml
index 5d558cf..0ecc2b2 100644 (file)
--- a/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-schema-service/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" . }}
       annotations:
@@ -70,9 +70,6 @@ spec:
         - name: LOCAL_GROUP_ID
           value: {{ .Values.securityContext.group_id | quote }}
         volumeMounts:
-        - mountPath: /etc/localtime
-          name: localtime
-          readOnly: true
         - mountPath: /opt/app/aai-schema-service/resources/etc/appprops/aaiconfig.properties
           name: aaiconfig-conf
           subPath: aaiconfig.properties
@@ -126,9 +123,6 @@ spec:
       - name: aai-common-aai-auth-mount
         secret:
           secretName: aai-common-aai-auth
-      - name: localtime
-        hostPath:
-          path: /etc/localtime
       - name: logs
         emptyDir: {}
       {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix .)) | nindent 6 }}
@@ -148,5 +142,4 @@ spec:
         configMap:
           name: {{ include "common.fullname" . }}-realm
       restartPolicy: {{ .Values.restartPolicy }}
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
+      {{- include "common.imagePullSecrets" . | nindent 6 }}