summaryrefslogtreecommitdiffstats
path: root/kubernetes/clamp/components/clamp-dash-kibana
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-21 21:32:40 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-21 21:34:31 +0100
commitf83984f253ac78cddef1344e986140d9bea6892c (patch)
treea592affe7119b7e393f35185798d55e848f6ffe6 /kubernetes/clamp/components/clamp-dash-kibana
parent2b2aa11021114438591d184af19fde6bbf06950a (diff)
[CLAMP] Uses new tpls for repos / images
This commit makes clamp 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: I5e266d3adaecc1cb65c35732c2d174dd159b8a03
Diffstat (limited to 'kubernetes/clamp/components/clamp-dash-kibana')
-rw-r--r--kubernetes/clamp/components/clamp-dash-kibana/requirements.yaml3
-rw-r--r--kubernetes/clamp/components/clamp-dash-kibana/templates/deployment.yaml4
-rw-r--r--kubernetes/clamp/components/clamp-dash-kibana/values.yaml8
3 files changed, 5 insertions, 10 deletions
diff --git a/kubernetes/clamp/components/clamp-dash-kibana/requirements.yaml b/kubernetes/clamp/components/clamp-dash-kibana/requirements.yaml
index 317d5b5d79..c388db3113 100644
--- a/kubernetes/clamp/components/clamp-dash-kibana/requirements.yaml
+++ b/kubernetes/clamp/components/clamp-dash-kibana/requirements.yaml
@@ -19,4 +19,7 @@ dependencies:
repository: '@local'
- name: certInitializer
version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/clamp/components/clamp-dash-kibana/templates/deployment.yaml b/kubernetes/clamp/components/clamp-dash-kibana/templates/deployment.yaml
index 99f0079831..8cb95cdf0b 100644
--- a/kubernetes/clamp/components/clamp-dash-kibana/templates/deployment.yaml
+++ b/kubernetes/clamp/components/clamp-dash-kibana/templates/deployment.yaml
@@ -48,13 +48,13 @@ 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
{{ include "common.certInitializer.initContainer" . | indent 6 }}
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/clamp/components/clamp-dash-kibana/values.yaml b/kubernetes/clamp/components/clamp-dash-kibana/values.yaml
index a5d11c73cb..9b5f1fc344 100644
--- a/kubernetes/clamp/components/clamp-dash-kibana/values.yaml
+++ b/kubernetes/clamp/components/clamp-dash-kibana/values.yaml
@@ -18,8 +18,6 @@
#################################################################
global:
nodePortPrefix: 302
- repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
- readinessImage: onap/oom/readiness:3.0.1
persistence: {}
centralizedLoggingEnabled: true
#AAF service
@@ -64,13 +62,7 @@ flavor: small
#################################################################
# Application configuration defaults.
#################################################################
-
-# BusyBox image
-busyboxRepository: docker.io
-busyboxImage: library/busybox:latest
-
# application image
-repository: nexus3.onap.org:10001
image: onap/clamp-dashboard-kibana:5.0.4
pullPolicy: Always