summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYury Novitsky <Yury.Novitsky@Amdocs.com>2018-05-09 09:14:10 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-09 09:14:10 +0000
commit54eab4210462d9b414fe07600b93dee450f0e14e (patch)
treea4db01e61a2cfa8525b81cebbfc12c7c2c719bef
parent285042d955292b69d04564e0a59d209082d8b149 (diff)
parent339b749f934cb9dc32700e13cb2bb6a9f465d95b (diff)
Merge "Fix consul images repo"
-rw-r--r--kubernetes/consul/charts/consul-server/templates/deployment.yaml2
-rw-r--r--kubernetes/consul/templates/deployment.yaml2
-rw-r--r--kubernetes/consul/values.yaml4
3 files changed, 6 insertions, 2 deletions
diff --git a/kubernetes/consul/charts/consul-server/templates/deployment.yaml b/kubernetes/consul/charts/consul-server/templates/deployment.yaml
index 12403e77c9..8272d3c01a 100644
--- a/kubernetes/consul/charts/consul-server/templates/deployment.yaml
+++ b/kubernetes/consul/charts/consul-server/templates/deployment.yaml
@@ -34,6 +34,8 @@ spec:
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"]
diff --git a/kubernetes/consul/templates/deployment.yaml b/kubernetes/consul/templates/deployment.yaml
index 646922b30f..8fd09b728e 100644
--- a/kubernetes/consul/templates/deployment.yaml
+++ b/kubernetes/consul/templates/deployment.yaml
@@ -34,6 +34,8 @@ spec:
release: {{ .Release.Name }}
name: {{ include "common.name" . }}
spec:
+ imagePullSecrets:
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
containers:
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
command:
diff --git a/kubernetes/consul/values.yaml b/kubernetes/consul/values.yaml
index 6ff0390991..0b5f7fe027 100644
--- a/kubernetes/consul/values.yaml
+++ b/kubernetes/consul/values.yaml
@@ -26,8 +26,8 @@ global:
# 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