summaryrefslogtreecommitdiffstats
path: root/kubernetes/so/components/so-openstack-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-openstack-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-openstack-adapter')
-rwxr-xr-xkubernetes/so/components/so-openstack-adapter/requirements.yaml3
-rwxr-xr-xkubernetes/so/components/so-openstack-adapter/templates/deployment.yaml4
-rwxr-xr-xkubernetes/so/components/so-openstack-adapter/values.yaml5
3 files changed, 5 insertions, 7 deletions
diff --git a/kubernetes/so/components/so-openstack-adapter/requirements.yaml b/kubernetes/so/components/so-openstack-adapter/requirements.yaml
index b0bda362dd..82296bee1d 100755
--- a/kubernetes/so/components/so-openstack-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/requirements.yaml
@@ -21,6 +21,9 @@ dependencies:
- name: readinessCheck
version: ~6.x-0
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-openstack-adapter/templates/deployment.yaml b/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml
index ac335c859a..3fee225c03 100755
--- a/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml
@@ -44,7 +44,7 @@ spec:
{{ include "common.readinessCheck.waitFor" . | indent 6 | trim }}
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:
@@ -92,7 +92,7 @@ spec:
protocol: TCP
# Filebeat sidecar container
- name: {{ include "common.name" . }}-filebeat-onap
- image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+ image: {{ include "repositoryGenerator.image.logging" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: {{ include "common.fullname" . }}-filebeat-conf
diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml
index 129ad59385..392f8472d4 100755
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -17,10 +17,6 @@
global:
nodePortPrefix: 302
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:
@@ -63,7 +59,6 @@ secrets:
#################################################################
image: onap/so/openstack-adapter:1.7.10
pullPolicy: Always
-repository: nexus3.onap.org:10001
db:
userName: so_user