aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-19 17:27:59 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-12-01 13:41:27 +0100
commitab116a5f0c10b96ddd2f006e945647670ab148e5 (patch)
treeaa6e5a59ff7653a25ec6ce4b7c9f471826dc2e9d
parentb2188514ae53ca61abb7d7cc90279279cb489301 (diff)
[VID] Uses new tpls for repos / images
This commit makes VID template to use the new generator for repositories and images. Issue-ID: OOM-2364 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I99c371c949398ecb6a2437c3ddd49a74f5a2c97e
-rw-r--r--kubernetes/vid/requirements.yaml3
-rw-r--r--kubernetes/vid/templates/deployment.yaml6
-rw-r--r--kubernetes/vid/values.yaml16
3 files changed, 12 insertions, 13 deletions
diff --git a/kubernetes/vid/requirements.yaml b/kubernetes/vid/requirements.yaml
index a3b349dda8..c6554cada2 100644
--- a/kubernetes/vid/requirements.yaml
+++ b/kubernetes/vid/requirements.yaml
@@ -27,4 +27,7 @@ dependencies:
version: ~7.x-0
repository: '@local'
condition: not global.mariadbGalera.localCluster
+ - name: repositoryGenerator
+ version: ~7.x-0
+ repository: '@local'
diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml
index 41b0019cbe..856a853960 100644
--- a/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@ -48,12 +48,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 }}
ports:
- containerPort: {{ .Values.service.internalPort }}
@@ -139,7 +139,7 @@ spec:
{{- end }}
# side car containers
- name: filebeat-onap
- image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+ image: {{ include "repositoryGenerator.image.logging" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /usr/share/filebeat/filebeat.yml
diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index 93de57e4b3..47cd73aff2 100644
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -18,9 +18,6 @@
# Declare variables to be passed into your templates.
global:
nodePortPrefix: 302
- readinessImage: onap/oom/readiness:3.0.1
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
mariadbGalera: &mariadbGalera
#This flag allows VID to instantiate its own mariadb-galera cluster
localCluster: false
@@ -43,7 +40,6 @@ subChartsOnly:
enabled: true
# application image
-repository: nexus3.onap.org:10001
image: onap/vid:7.0.0
pullPolicy: Always
@@ -70,8 +66,8 @@ config:
roleaccesscentralized: remote
mariadb-galera:
- # '&mariadbConfig' means we "store" the values for later use in the file
- # with '*mariadbConfig' pointer.
+ # '&mariadbConfig' means we "store" the values for later use in the file
+ # with '*mariadbConfig' pointer.
config: &mariadbConfig
userCredentialsExternalSecret: '{{ include "common.release" . }}-vid-db-user-secret'
mysqlDatabase: vid_openecomp_epsdk
@@ -127,11 +123,11 @@ service:
ingress:
enabled: false
service:
- - baseaddr: "vid.api"
- name: "vid-http"
- port: 8443
+ - baseaddr: "vid.api"
+ name: "vid-http"
+ port: 8443
config:
- ssl: "redirect"
+ ssl: "redirect"
# Resource Limit flavor -By Default using small
flavor: small