Merge "[CPS] New Delhi release changes"

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

diff --git a/kubernetes/robot/templates/deployment.yaml b/kubernetes/robot/templates/deployment.yaml
index a466189..4736d6d 100644 (file)
--- a/kubernetes/robot/templates/deployment.yaml
+++ b/kubernetes/robot/templates/deployment.yaml
@@ -47,7 +47,7 @@ spec:
         - "so-monitoring"
       containers:
       - name: {{ include "common.name" . }}
-        image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+        image: "{{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         ports:
         - containerPort: {{ .Values.service.internalPort }}
@@ -66,9 +66,6 @@ spec:
         volumeMounts:
         - name: dshm
           mountPath: /dev/shm
-        - name: localtime
-          mountPath: /etc/localtime
-          readOnly: true
         - name: robot-eteshare
           mountPath: /share/config
         - name: robot-lighttpd
@@ -77,8 +74,7 @@ spec:
           mountPath: /etc/lighttpd/ssl
         - name: robot-logs
           mountPath: /share/logs
-        resources:
-{{ include "common.resources" . }}
+        resources: {{ include "common.resources" . | nindent 10 }}
       {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}
@@ -98,9 +94,6 @@ spec:
       - name: dshm
         emptyDir:
           medium: Memory
-      - name: localtime
-        hostPath:
-          path: /etc/localtime
       - name: robot-eteshare
         configMap:
           name: {{ include "common.fullname" . }}-eteshare-configmap
@@ -113,5 +106,4 @@ spec:
         configMap:
           name: {{ include "common.fullname" . }}-lighttpd-ssl-configmap
           defaultMode: 0600
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
+      {{- include "common.imagePullSecrets" . | nindent 6 }}