commit 54eab4210462d9b414fe07600b93dee450f0e14e
author Yury Novitsky <Yury.Novitsky@Amdocs.com> Wed May 09 09:14:10 2018 +0000
committer Gerrit Code Review <gerrit@onap.org> Wed May 09 09:14:10 2018 +0000
tree a4db01e61a2cfa8525b81cebbfc12c7c2c719bef
parent 285042d955292b69d04564e0a59d209082d8b149
parent 339b749f934cb9dc32700e13cb2bb6a9f465d95b

Merge "Fix consul images repo"

kubernetes/consul/charts/consul-server/templates/deployment.yaml

diff --git a/kubernetes/consul/charts/consul-server/templates/deployment.yaml b/kubernetes/consul/charts/consul-server/templates/deployment.yaml
index 12403e7..8272d3c 100644
--- a/kubernetes/consul/charts/consul-server/templates/deployment.yaml
+++ b/kubernetes/consul/charts/consul-server/templates/deployment.yaml
@@ -34,6 +34,8 @@
         release: {{ .Release.Name }}
       name: {{ include "common.name" . }}
     spec:
+      imagePullSecrets:
+      - name: "{{ include "common.namespace" . }}-docker-registry-key"
       containers:
       - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
         command: ["/usr/local/bin/docker-entrypoint.sh"]

kubernetes/consul/templates/deployment.yaml

diff --git a/kubernetes/consul/templates/deployment.yaml b/kubernetes/consul/templates/deployment.yaml
index 646922b..8fd09b7 100644
--- a/kubernetes/consul/templates/deployment.yaml
+++ b/kubernetes/consul/templates/deployment.yaml
@@ -34,6 +34,8 @@
         release: {{ .Release.Name }}
       name: {{ include "common.name" . }}
     spec:
+      imagePullSecrets:
+      - name: "{{ include "common.namespace" . }}-docker-registry-key"
       containers:
       - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
         command:

kubernetes/consul/values.yaml

diff --git a/kubernetes/consul/values.yaml b/kubernetes/consul/values.yaml
index 6ff0390..0b5f7fe 100644
--- a/kubernetes/consul/values.yaml
+++ b/kubernetes/consul/values.yaml
@@ -26,8 +26,8 @@
 # Application configuration defaults.
 #################################################################
 # application image
-repository: oomk8s
-image: consul:1.0.0
+repository: docker.io
+image: oomk8s/consul:1.0.0
 pullPolicy: Always
 
 #subchart name