summaryrefslogtreecommitdiffstats
path: root/kubernetes/so/components/so-vnfm-adapter
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-19 17:40:05 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-21 08:14:02 +0000
commit747982c26fb62c0605541117a9b8a5fd00a3fc32 (patch)
tree2353923afe24a0569f73278953b2bf1bfec8a257 /kubernetes/so/components/so-vnfm-adapter
parent2b2aa11021114438591d184af19fde6bbf06950a (diff)
[SO] Uses new tpls for repos / images
This commit makes SO 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: Ife4e1fcfff565b3ada7e726913826e2c9f76bc07
Diffstat (limited to 'kubernetes/so/components/so-vnfm-adapter')
-rwxr-xr-xkubernetes/so/components/so-vnfm-adapter/requirements.yaml3
-rwxr-xr-xkubernetes/so/components/so-vnfm-adapter/templates/deployment.yaml24
-rwxr-xr-xkubernetes/so/components/so-vnfm-adapter/values.yaml5
3 files changed, 15 insertions, 17 deletions
diff --git a/kubernetes/so/components/so-vnfm-adapter/requirements.yaml b/kubernetes/so/components/so-vnfm-adapter/requirements.yaml
index 1feea23842..d25c12c663 100755
--- a/kubernetes/so/components/so-vnfm-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-vnfm-adapter/requirements.yaml
@@ -18,6 +18,9 @@ dependencies:
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
- name: soHelpers
version: ~6.x-0
repository: 'file://../soHelpers'
diff --git a/kubernetes/so/components/so-vnfm-adapter/templates/deployment.yaml b/kubernetes/so/components/so-vnfm-adapter/templates/deployment.yaml
index 24dd3d6d21..8abd9a9796 100755
--- a/kubernetes/so/components/so-vnfm-adapter/templates/deployment.yaml
+++ b/kubernetes/so/components/so-vnfm-adapter/templates/deployment.yaml
@@ -26,13 +26,13 @@ spec:
selector:
matchLabels:
app: {{ include "common.name" . }}
- replicas: {{ index .Values.replicaCount }}
- minReadySeconds: {{ index .Values.minReadySeconds }}
+ replicas: {{ .Values.replicaCount }}
+ minReadySeconds: {{ .Values.minReadySeconds }}
strategy:
- type: {{ index .Values.updateStrategy.type }}
+ type: {{ .Values.updateStrategy.type }}
rollingUpdate:
- maxUnavailable: {{ index .Values.updateStrategy.maxUnavailable }}
- maxSurge: {{ index .Values.updateStrategy.maxSurge }}
+ maxUnavailable: {{ .Values.updateStrategy.maxUnavailable }}
+ maxSurge: {{ .Values.updateStrategy.maxSurge }}
template:
metadata:
labels:
@@ -42,7 +42,7 @@ spec:
initContainers: {{ include "so.certificate.container_importer" . | nindent 6 }}
containers:
- name: {{ include "common.name" . }}
- image: {{ include "common.repository" . }}/{{ .Values.image }}
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
resources: {{ include "common.resources" . | nindent 12 }}
{{- if .Values.global.aafEnabled }}
command:
@@ -70,13 +70,13 @@ spec:
readOnly: true
livenessProbe:
tcpSocket:
- port: {{ index .Values.livenessProbe.port }}
- initialDelaySeconds: {{ index .Values.livenessProbe.initialDelaySeconds}}
- periodSeconds: {{ index .Values.livenessProbe.periodSeconds}}
- successThreshold: {{ index .Values.livenessProbe.successThreshold}}
- failureThreshold: {{ index .Values.livenessProbe.failureThreshold}}
+ port: {{ .Values.livenessProbe.port }}
+ initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds}}
+ periodSeconds: {{ .Values.livenessProbe.periodSeconds}}
+ successThreshold: {{ .Values.livenessProbe.successThreshold}}
+ failureThreshold: {{ .Values.livenessProbe.failureThreshold}}
ports:
- - containerPort: {{ index .Values.containerPort }}
+ - containerPort: {{ .Values.containerPort }}
name: {{ .Values.service.portName }}
protocol: TCP
volumes: {{ include "so.certificate.volumes" . | nindent 6 }}
diff --git a/kubernetes/so/components/so-vnfm-adapter/values.yaml b/kubernetes/so/components/so-vnfm-adapter/values.yaml
index f8fa7c93be..6aebf31932 100755
--- a/kubernetes/so/components/so-vnfm-adapter/values.yaml
+++ b/kubernetes/so/components/so-vnfm-adapter/values.yaml
@@ -16,10 +16,6 @@
#################################################################
global:
nodePortPrefixExt: 304
- repository: nexus3.onap.org:10001
- readinessImage: onap/oom/readiness:3.0.1
- aafAgentImage: onap/aaf/aaf_agent:2.1.20
- envsubstImage: dibi/envsubst
persistence:
mountPath: /dockerdata-nfs
security:
@@ -32,7 +28,6 @@ global:
#################################################################
# Application configuration defaults.
#################################################################
-repository: nexus3.onap.org:10001
image: onap/so/vnfm-adapter:1.7.10
pullPolicy: Always