diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-21 22:13:05 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-21 22:13:05 +0100 |
| commit | d26cf9f929fdfb16919849502666961f36e68039 (patch) | |
| tree | da6dd43d8f0713fdcb78b7bd05e2a142a14c5e6c /kubernetes/consul/charts | |
| parent | 2b2aa11021114438591d184af19fde6bbf06950a (diff) | |
[CONSUL] Uses new tpls for repos / images
This commit makes Consul chart to use the new generator for repositories and
images.
Issue-ID: OOM-2364
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: Id46ed756b1f975695585e873c8e13accf3b1d7ca
Diffstat (limited to 'kubernetes/consul/charts')
| -rw-r--r-- | kubernetes/consul/charts/consul-server/templates/statefulset.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/consul/charts/consul-server/values.yaml | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/kubernetes/consul/charts/consul-server/templates/statefulset.yaml b/kubernetes/consul/charts/consul-server/templates/statefulset.yaml index 430b6dd1bd..882e98fea3 100644 --- a/kubernetes/consul/charts/consul-server/templates/statefulset.yaml +++ b/kubernetes/consul/charts/consul-server/templates/statefulset.yaml @@ -41,7 +41,7 @@ spec: - name: "{{ include "common.namespace" . }}-docker-registry-key" containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }} command: ["/usr/local/bin/docker-entrypoint.sh"] args: - "agent" diff --git a/kubernetes/consul/charts/consul-server/values.yaml b/kubernetes/consul/charts/consul-server/values.yaml index 81472e71eb..0039aa6654 100644 --- a/kubernetes/consul/charts/consul-server/values.yaml +++ b/kubernetes/consul/charts/consul-server/values.yaml @@ -17,15 +17,11 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 ################################################################# # Application configuration defaults. ################################################################# # application image -repository: docker.io image: consul:1.0.6 pullPolicy: Always |