summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdnc/components/sdnc-web
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-11-30 09:17:04 +0000
committerGerrit Code Review <gerrit@onap.org>2020-11-30 09:17:04 +0000
commit6f1cdc1aee56e11d8c05e569e5f5f31351b5fb1e (patch)
tree96cbfeb1cc3c35dd89424b47d502875ff80dc25d /kubernetes/sdnc/components/sdnc-web
parent8078860750eeb57c94758440492d2341241a6d53 (diff)
parentcbc703c708b0c4805e4280e04d88dd3dea5b6e95 (diff)
Merge "[SDNC] Uses new tpls for repos / images"
Diffstat (limited to 'kubernetes/sdnc/components/sdnc-web')
-rw-r--r--kubernetes/sdnc/components/sdnc-web/requirements.yaml3
-rw-r--r--kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml4
-rw-r--r--kubernetes/sdnc/components/sdnc-web/values.yaml4
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 acaf1ae900..a2e3a48e25 100644
--- a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
@@ -25,7 +25,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
@@ -41,7 +41,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