summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-21 22:30:52 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-12-01 13:28:57 +0100
commit2628ad97ce8e9928b657e111042415941f7efa41 (patch)
tree24c1c3e5a3295cdcab690b718ffac1bbb6a26b31 /kubernetes
parentb2188514ae53ca61abb7d7cc90279279cb489301 (diff)
[CLI] Uses new tpls for repos / images
This commit makes CLI 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: I8495ee50765eccfd25802ff23b1744ea356bb7b2
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/cli/requirements.yaml3
-rw-r--r--kubernetes/cli/templates/deployment.yaml2
-rw-r--r--kubernetes/cli/values.yaml2
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