diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-21 22:40:19 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-21 22:40:19 +0100 |
| commit | 6027f260b4d7e161c5b6866c285a451bc253ccc1 (patch) | |
| tree | 4a0f247e0fe8cbf3a46d94b389295b7e49a076b1 | |
| parent | 2b2aa11021114438591d184af19fde6bbf06950a (diff) | |
[HELM] Uses new tpls for repos / images
This commit makes Helm example 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: I1561fa6626687cf841c278231f2caab9cd99d46b
| -rw-r--r-- | kubernetes/helm/starters/onap-app/requirements.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/helm/starters/onap-app/templates/deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/helm/starters/onap-app/values.yaml | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/kubernetes/helm/starters/onap-app/requirements.yaml b/kubernetes/helm/starters/onap-app/requirements.yaml index 6a61926e9e..b8e59b0910 100644 --- a/kubernetes/helm/starters/onap-app/requirements.yaml +++ b/kubernetes/helm/starters/onap-app/requirements.yaml @@ -15,4 +15,7 @@ dependencies: - name: common version: ~6.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~6.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/helm/starters/onap-app/templates/deployment.yaml b/kubernetes/helm/starters/onap-app/templates/deployment.yaml index b409781c5e..fc76c1ff6d 100644 --- a/kubernetes/helm/starters/onap-app/templates/deployment.yaml +++ b/kubernetes/helm/starters/onap-app/templates/deployment.yaml @@ -43,12 +43,12 @@ spec: # fieldRef: # apiVersion: v1 # fieldPath: metadata.namespace -# image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" +# image: {{ include "repositoryGenerator.image.readiness" . }} # imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} # name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} diff --git a/kubernetes/helm/starters/onap-app/values.yaml b/kubernetes/helm/starters/onap-app/values.yaml index 5bbe8f25d9..702bfb2a73 100644 --- a/kubernetes/helm/starters/onap-app/values.yaml +++ b/kubernetes/helm/starters/onap-app/values.yaml @@ -17,16 +17,11 @@ ################################################################# global: nodePortPrefix: 302 - repository: nexus3.onap.org:10001 - readinessImage: onap/oom/readiness:3.0.1 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: <onap-app>:<1.2-STAGING-latest> pullPolicy: Always |