summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorJulien Barbot <julien@barbot.org>2018-10-22 17:53:07 +0200
committerJulien Barbot <julien@barbot.org>2018-10-22 17:55:47 +0200
commited56cca268c5832871773e5fe6b9b50e51bf694f (patch)
tree8ad590f9b9f434074488773db535eae4249db46b /kubernetes
parent665fdc13580d5a3d2f56b49b37227a518ac4ce12 (diff)
Clamp: Use "common.repository" framework
Change-Id: Ic1180781387700a8af36f84f619ffd66a5c02c34 Issue-ID: OOM-874 Signed-off-by: Julien Barbot <julien@barbot.org>
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml2
-rw-r--r--kubernetes/clamp/charts/clamp-dash-kibana/values.yaml2
-rw-r--r--kubernetes/clamp/charts/clamp-dash-logstash/templates/deployment.yaml2
-rw-r--r--kubernetes/clamp/charts/clamp-dash-logstash/values.yaml2
4 files changed, 4 insertions, 4 deletions
diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
index 0f5a93347a..d29148fe71 100644
--- a/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
@@ -48,7 +48,7 @@ spec:
name: {{ include "common.name" . }}-readiness
containers:
- name: {{ include "common.name" . }}
- image: "{{ .Values.global.imageRepository | default .Values.imageRepository }}/{{ .Values.image }}"
+ image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml
index 1d6e60f745..950029c7a6 100644
--- a/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml
@@ -32,7 +32,7 @@ busyboxRepository: registry.hub.docker.com
busyboxImage: library/busybox:latest
# application image
-imageRepository: nexus3.onap.org:10001
+repository: nexus3.onap.org:10001
image: onap/clamp-dashboard-kibana:3.0.0
pullPolicy: Always
diff --git a/kubernetes/clamp/charts/clamp-dash-logstash/templates/deployment.yaml b/kubernetes/clamp/charts/clamp-dash-logstash/templates/deployment.yaml
index aff9a0de71..6c6331a9c2 100644
--- a/kubernetes/clamp/charts/clamp-dash-logstash/templates/deployment.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-logstash/templates/deployment.yaml
@@ -48,7 +48,7 @@ spec:
name: {{ include "common.name" . }}-readiness
containers:
- name: {{ include "common.name" . }}
- image: "{{ .Values.global.imageRepository| default .Values.imageRepository }}/{{ .Values.image }}"
+ image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: dmaap_consumer_group
diff --git a/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml b/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml
index 41b93c46df..586132de15 100644
--- a/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml
@@ -28,7 +28,7 @@ global:
#################################################################
# application image
-imageRepository: nexus3.onap.org:10001
+repository: nexus3.onap.org:10001
image: onap/clamp-dashboard-logstash:3.0.0
pullPolicy: Always