diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-10-22 16:44:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-22 16:44:56 +0000 |
| commit | 10c1f777859197edf43670fdf2312cecabfd06e7 (patch) | |
| tree | 1350449b1e8deca6353507ebb8d6cf43a6ae2a8e /kubernetes/clamp | |
| parent | 8a1f02084850110cdc47474ed99cceda98f96e41 (diff) | |
| parent | ed56cca268c5832871773e5fe6b9b50e51bf694f (diff) | |
Merge changes from topic 'common-repository'
* changes:
Clamp: Use "common.repository" framework
Use "common.repository" framework
Diffstat (limited to 'kubernetes/clamp')
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 |