diff options
author | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-19 17:42:15 +0100 |
---|---|---|
committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-21 16:43:32 +0000 |
commit | f9bb1ec483a9e5b5044c45e4dd66386446b0b379 (patch) | |
tree | c6c59c7d88ea673d95d3c2374fd1db5462ba486c | |
parent | 2b2aa11021114438591d184af19fde6bbf06950a (diff) |
[SNIRO] Uses new tpls for repos / images
This commit makes SNIRO emulator 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: I3dac5500ce44920bf686f4ff3ea8e9ffb430bf75
-rw-r--r-- | kubernetes/sniro-emulator/requirements.yaml | 3 | ||||
-rw-r--r-- | kubernetes/sniro-emulator/templates/deployment.yaml | 2 | ||||
-rw-r--r-- | kubernetes/sniro-emulator/values.yaml | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/kubernetes/sniro-emulator/requirements.yaml b/kubernetes/sniro-emulator/requirements.yaml index e85005b9ae..a72069ff78 100644 --- a/kubernetes/sniro-emulator/requirements.yaml +++ b/kubernetes/sniro-emulator/requirements.yaml @@ -19,3 +19,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/sniro-emulator/templates/deployment.yaml b/kubernetes/sniro-emulator/templates/deployment.yaml index ed07bb65c5..0dff4eb7be 100644 --- a/kubernetes/sniro-emulator/templates/deployment.yaml +++ b/kubernetes/sniro-emulator/templates/deployment.yaml @@ -38,7 +38,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 }} ports: - containerPort: {{ .Values.service.internalPort }} diff --git a/kubernetes/sniro-emulator/values.yaml b/kubernetes/sniro-emulator/values.yaml index e81481da2d..81ce818a8a 100644 --- a/kubernetes/sniro-emulator/values.yaml +++ b/kubernetes/sniro-emulator/values.yaml @@ -19,7 +19,6 @@ global: # global defaults nodePortPrefix: 302 # application image -repository: nexus3.onap.org:10001 image: onap/sniroemulator:1.0.0 pullPolicy: IfNotPresent |