diff options
author | Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-11-23 11:04:00 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-11-23 11:04:00 +0000 |
commit | af614c6913a3e7d4f3dc632d4f9067f98c113d9b (patch) | |
tree | 7270fca1adaa1b814a47a73a775529ed66e8f645 /kubernetes/so/components/so-request-db-adapter | |
parent | 87803a46f67959b3f804a409899bc382ce283763 (diff) | |
parent | 747982c26fb62c0605541117a9b8a5fd00a3fc32 (diff) |
Merge "[SO] Uses new tpls for repos / images"
Diffstat (limited to 'kubernetes/so/components/so-request-db-adapter')
3 files changed, 4 insertions, 6 deletions
diff --git a/kubernetes/so/components/so-request-db-adapter/requirements.yaml b/kubernetes/so/components/so-request-db-adapter/requirements.yaml index b0bda362dd..82296bee1d 100755 --- a/kubernetes/so/components/so-request-db-adapter/requirements.yaml +++ b/kubernetes/so/components/so-request-db-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-request-db-adapter/templates/deployment.yaml b/kubernetes/so/components/so-request-db-adapter/templates/deployment.yaml index 0aac5f4b48..75e6b1ee62 100755 --- a/kubernetes/so/components/so-request-db-adapter/templates/deployment.yaml +++ b/kubernetes/so/components/so-request-db-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: diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml index e221870306..208cf64b6f 100755 --- a/kubernetes/so/components/so-request-db-adapter/values.yaml +++ b/kubernetes/so/components/so-request-db-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: @@ -61,7 +57,6 @@ secrets: ################################################################# # Application configuration defaults. ################################################################# -repository: nexus3.onap.org:10001 image: onap/so/request-db-adapter:1.7.10 pullPolicy: Always |