diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-19 17:52:07 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-27 14:17:21 +0000 |
| commit | cbc703c708b0c4805e4280e04d88dd3dea5b6e95 (patch) | |
| tree | 550ec8d258f535c2e92cdc39f6d1252dfe3822e9 /kubernetes/sdnc/components/sdnc-web | |
| parent | a6fa6b1fe4c8c9b8e2a3e29b364dc96804404a9c (diff) | |
[SDNC] Uses new tpls for repos / images
This commit makes SDNC 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: Iec8379934829947be1cb466b007c949a8448e742
Diffstat (limited to 'kubernetes/sdnc/components/sdnc-web')
| -rw-r--r-- | kubernetes/sdnc/components/sdnc-web/requirements.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/sdnc/components/sdnc-web/values.yaml | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/kubernetes/sdnc/components/sdnc-web/requirements.yaml b/kubernetes/sdnc/components/sdnc-web/requirements.yaml index dcb280d037..fbf6d0d866 100644 --- a/kubernetes/sdnc/components/sdnc-web/requirements.yaml +++ b/kubernetes/sdnc/components/sdnc-web/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/sdnc/components/sdnc-web/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml index 7c1f262ec2..501125f99c 100644 --- a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml +++ b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: spec: initContainers: {{ include "common.certInitializer.initContainer" . | indent 6 }} - name: {{ include "common.name" . }}-readiness - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: - /app/ready.py @@ -42,7 +42,7 @@ spec: 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: {{- include "common.containerPorts" . | indent 10 }} # disable liveness probe when breakpoints set in debugger diff --git a/kubernetes/sdnc/components/sdnc-web/values.yaml b/kubernetes/sdnc/components/sdnc-web/values.yaml index 136379a7a2..f040736794 100644 --- a/kubernetes/sdnc/components/sdnc-web/values.yaml +++ b/kubernetes/sdnc/components/sdnc-web/values.yaml @@ -18,15 +18,11 @@ global: aafEnabled: true nodePortPrefix: 322 - readinessImage: onap/oom/readiness:3.0.1 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 k8scluster: svc.cluster.local ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: "onap/sdnc-web-image:2.0.4" pullPolicy: Always |