diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-11-30 09:17:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-11-30 09:17:04 +0000 |
| commit | 6f1cdc1aee56e11d8c05e569e5f5f31351b5fb1e (patch) | |
| tree | 96cbfeb1cc3c35dd89424b47d502875ff80dc25d /kubernetes/sdnc/components/sdnc-prom | |
| parent | 8078860750eeb57c94758440492d2341241a6d53 (diff) | |
| parent | cbc703c708b0c4805e4280e04d88dd3dea5b6e95 (diff) | |
Merge "[SDNC] Uses new tpls for repos / images"
Diffstat (limited to 'kubernetes/sdnc/components/sdnc-prom')
| -rw-r--r-- | kubernetes/sdnc/components/sdnc-prom/requirements.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/sdnc/components/sdnc-prom/values.yaml | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/kubernetes/sdnc/components/sdnc-prom/requirements.yaml b/kubernetes/sdnc/components/sdnc-prom/requirements.yaml index e4c7240290..6317f585bb 100644 --- a/kubernetes/sdnc/components/sdnc-prom/requirements.yaml +++ b/kubernetes/sdnc/components/sdnc-prom/requirements.yaml @@ -16,3 +16,6 @@ dependencies: - name: common version: ~6.x-0 repository: '@local' + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml index 1853ab937e..1c9adad5a0 100644 --- a/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml +++ b/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml @@ -40,12 +40,12 @@ 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 containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} envFrom: - configMapRef: diff --git a/kubernetes/sdnc/components/sdnc-prom/values.yaml b/kubernetes/sdnc/components/sdnc-prom/values.yaml index 9551bc4ffd..d9afd1aab0 100644 --- a/kubernetes/sdnc/components/sdnc-prom/values.yaml +++ b/kubernetes/sdnc/components/sdnc-prom/values.yaml @@ -17,10 +17,6 @@ ################################################################# global: nodePortPrefix: 302 - repository: nexus3.onap.org:10001 - readinessImage: onap/oom/readiness:3.0.1 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 persistence: mountPath: /dockerdata-nfs @@ -28,7 +24,6 @@ global: # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 pullPolicy: Always image: onap/music/prom:1.0.5 |