diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-11-25 11:15:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-11-25 11:15:40 +0000 |
| commit | 44c4dd905a5b1a825e95ff4d4817616f78f8dd75 (patch) | |
| tree | b3c52d1d05a3fb36d5bc9c2c4065f5eba8972816 /kubernetes | |
| parent | c2baf1f5798e6ae9d87ffbc6cb4319b8af776656 (diff) | |
| parent | d26cf9f929fdfb16919849502666961f36e68039 (diff) | |
Merge "[CONSUL] Uses new tpls for repos / images"
Diffstat (limited to 'kubernetes')
| -rw-r--r-- | kubernetes/consul/charts/consul-server/templates/statefulset.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/consul/charts/consul-server/values.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/consul/requirements.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/consul/templates/deployment.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/consul/values.yaml | 4 |
5 files changed, 5 insertions, 10 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 diff --git a/kubernetes/consul/requirements.yaml b/kubernetes/consul/requirements.yaml index d3c442d32e..0b77abe706 100644 --- a/kubernetes/consul/requirements.yaml +++ b/kubernetes/consul/requirements.yaml @@ -20,3 +20,6 @@ dependencies: # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/consul/templates/deployment.yaml b/kubernetes/consul/templates/deployment.yaml index 51c6eb72d5..be15ecbca6 100644 --- 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" diff --git a/kubernetes/consul/values.yaml b/kubernetes/consul/values.yaml index 512c4c3dac..faebd8db52 100644 --- a/kubernetes/consul/values.yaml +++ b/kubernetes/consul/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: oomk8s/consul:1.0.0 pullPolicy: Always |