Merge "[AAI] Kyverno - disallow-host-path policy"

[oom.git] / kubernetes / aai / templates / deployment.yaml

diff --git a/kubernetes/aai/templates/deployment.yaml b/kubernetes/aai/templates/deployment.yaml
index fa26837..5b10c43 100644 (file)
--- a/kubernetes/aai/templates/deployment.yaml
+++ b/kubernetes/aai/templates/deployment.yaml
@@ -25,9 +25,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" . }}
@@ -51,9 +51,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.release" . }}
       annotations:
@@ -91,9 +91,6 @@ spec:
         image: "{{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         volumeMounts:
-        - mountPath: /etc/localtime
-          name: localtime
-          readOnly: true
         - mountPath: /dev/log
           name: aai-service-log
         - mountPath: /usr/local/etc/haproxy/haproxy.cfg
@@ -146,14 +143,10 @@ spec:
       {{- end }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
-        - name: localtime
-          hostPath:
-            path: /etc/localtime
         - name: aai-service-log
           hostPath:
             path: "/dev/log"
         - name: haproxy-cfg
           configMap:
             name: aai-deployment-configmap
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
+      {{- include "common.imagePullSecrets" . | nindent 6 }}