diff options
author | 2020-11-21 22:17:40 +0100 | |
---|---|---|
committer | 2020-11-22 17:12:48 +0000 | |
commit | cad63e58e3ff4c5a488f9a70de21e87aa592eb4e (patch) | |
tree | ffce4933751d9d9e45a82a999b8db62c29c71004 /kubernetes/dcaegen2/components/dcae-healthcheck | |
parent | 2b2aa11021114438591d184af19fde6bbf06950a (diff) |
[DCAE] Uses new tpls for repos / images
This commit makes DCAE 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: Ib0ba117864a95750ee5762636d94d22e9d029959
Diffstat (limited to 'kubernetes/dcaegen2/components/dcae-healthcheck')
3 files changed, 4 insertions, 5 deletions
diff --git a/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml index 6f858bda03..45dddcfbd1 100644 --- a/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml +++ b/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml @@ -20,3 +20,6 @@ dependencies: - name: common version: ~6.x-0 repository: '@local' + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/dcaegen2/components/dcae-healthcheck/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/templates/deployment.yaml index dc3254555c..9514f41b86 100644 --- a/kubernetes/dcaegen2/components/dcae-healthcheck/templates/deployment.yaml +++ b/kubernetes/dcaegen2/components/dcae-healthcheck/templates/deployment.yaml @@ -41,7 +41,7 @@ spec: spec: containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} resources: {{ include "common.resources" . | indent 12 }} diff --git a/kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml index d25889e028..a083694767 100644 --- a/kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml +++ b/kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml @@ -22,9 +22,6 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 service: name: dcae-healthcheck @@ -44,7 +41,6 @@ readiness: initialDelaySeconds: 10 periodSeconds: 10 # application image -repository: nexus3.onap.org:10001 image: onap/org.onap.dcaegen2.deployments.healthcheck-container:2.1.0 # Resource Limit flavor -By Default using small |