Merge "[DCAEMOD] Uses new tpls for repos / images"

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

diff --git a/kubernetes/consul/templates/deployment.yaml b/kubernetes/consul/templates/deployment.yaml
index a5b72ae..be15ecb 100644 (file)
--- a/kubernetes/consul/templates/deployment.yaml
+++ b/kubernetes/consul/templates/deployment.yaml
@@ -40,7 +40,7 @@ spec:
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
       containers:
-      - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+      - image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }}
         command:
         - /bin/sh
         - "-c"
@@ -61,6 +61,7 @@ spec:
           name: consul-agent-scripts-config
         - mountPath: /consul/certs
           name: consul-agent-certs-config
+        resources: {{ include "common.resources" . | nindent 10 }}
       volumes:
       - configMap:
           name: {{ include "common.fullname" . }}-configmap