diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-12-02 21:55:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-12-02 21:55:05 +0000 |
| commit | c6b46889bd9a72f85a06b8ce29b854ac1f922ca7 (patch) | |
| tree | 8903c0ac50f04c8f34919959c62b2ea985312206 | |
| parent | 8346ceb7e161bdb7550d5d86b10372320d1b0497 (diff) | |
| parent | 2628ad97ce8e9928b657e111042415941f7efa41 (diff) | |
Merge "[CLI] Uses new tpls for repos / images"
| -rw-r--r-- | kubernetes/cli/requirements.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/cli/templates/deployment.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/cli/values.yaml | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/kubernetes/cli/requirements.yaml b/kubernetes/cli/requirements.yaml index f5931d50ed..1e08aaf3cd 100644 --- a/kubernetes/cli/requirements.yaml +++ b/kubernetes/cli/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: ~7.x-0 + repository: '@local' diff --git a/kubernetes/cli/templates/deployment.yaml b/kubernetes/cli/templates/deployment.yaml index 0823daffb6..74b2d2df37 100644 --- a/kubernetes/cli/templates/deployment.yaml +++ b/kubernetes/cli/templates/deployment.yaml @@ -37,7 +37,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/cli/values.yaml b/kubernetes/cli/values.yaml index bf3ba5b099..6e711c51c0 100644 --- a/kubernetes/cli/values.yaml +++ b/kubernetes/cli/values.yaml @@ -17,12 +17,10 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/cli:6.0.0 pullPolicy: Always flavor: small |