[COMMON] Remove hostPath entries

[oom.git] / kubernetes / common / postgres / templates / _deployment.tpl

diff --git a/kubernetes/common/postgres/templates/_deployment.tpl b/kubernetes/common/postgres/templates/_deployment.tpl
index a4eb110..ff701a2 100644 (file)
--- a/kubernetes/common/postgres/templates/_deployment.tpl
+++ b/kubernetes/common/postgres/templates/_deployment.tpl
@@ -27,6 +27,12 @@ metadata:
   namespace: {{ include "common.namespace" $dot }}
   labels:
     app: {{ include "common.name" $dot }}-{{ $pgMode }}
+    app.kubernetes.io/name: {{ include "common.name" $dot }}-{{ $pgMode }}
+    {{- if $dot.Chart.AppVersion }}
+    version: "{{ $dot.Chart.AppVersion | replace "+" "_" }}"
+    {{- else }}
+    version: "{{ $dot.Chart.Version | replace "+" "_" }}"
+    {{- end }}
     chart: {{ $dot.Chart.Name }}-{{ $dot.Chart.Version | replace "+" "_" }}
     release: {{ include "common.release" $dot }}
     heritage: {{ $dot.Release.Service }}
@@ -42,11 +48,16 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" $dot }}-{{ $pgMode }}
+        app.kubernetes.io/name: {{ include "common.name" $dot }}-{{ $pgMode }}
+        {{- if $dot.Chart.AppVersion }}
+        version: "{{ $dot.Chart.AppVersion | replace "+" "_" }}"
+        {{- else }}
+        version: "{{ $dot.Chart.Version | replace "+" "_" }}"
+        {{- end }}
         release: {{ include "common.release" $dot }}
         name: "{{ index $dot.Values "container" "name" $pgMode }}"
     spec:
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" $dot }}-docker-registry-key"
+      {{- include "common.imagePullSecrets" $dot | nindent 6 }}
       initContainers:
       - command:
         - sh
@@ -211,9 +222,6 @@ spec:
 {{ toYaml $dot.Values.affinity | indent 10 }}
         {{- end }}
       volumes:
-      - name: localtime
-        hostPath:
-          path: /etc/localtime
       - name: {{ include "common.fullname" $dot }}-backup
         emptyDir: {}
       - name: {{ include "common.fullname" $dot }}-data