| commit | ed56cca268c5832871773e5fe6b9b50e51bf694f | [log] [tgz] |
|---|---|---|
| author | Julien Barbot <julien@barbot.org> | Mon Oct 22 17:53:07 2018 +0200 |
| committer | Julien Barbot <julien@barbot.org> | Mon Oct 22 17:55:47 2018 +0200 |
| tree | 8ad590f9b9f434074488773db535eae4249db46b | |
| parent | 665fdc13580d5a3d2f56b49b37227a518ac4ce12 [diff] |
Clamp: Use "common.repository" framework Change-Id: Ic1180781387700a8af36f84f619ffd66a5c02c34 Issue-ID: OOM-874 Signed-off-by: Julien Barbot <julien@barbot.org>
diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml index 0f5a933..d29148f 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 @@ 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 1d6e60f..950029c 100644 --- a/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml +++ b/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml
@@ -32,7 +32,7 @@ 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 aff9a0d..6c6331a 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 @@ 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 41b93c4..586132d 100644 --- a/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml +++ b/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml
@@ -28,7 +28,7 @@ ################################################################# # application image -imageRepository: nexus3.onap.org:10001 +repository: nexus3.onap.org:10001 image: onap/clamp-dashboard-logstash:3.0.0 pullPolicy: Always