diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-11-30 09:17:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-11-30 09:17:45 +0000 |
| commit | cfe8a79535c8972179638be2ed8bbc00210dd5dc (patch) | |
| tree | 9113fb725cee208ba85e0c4d0f02290080d969be /kubernetes/policy/components/policy-nexus | |
| parent | 6f1cdc1aee56e11d8c05e569e5f5f31351b5fb1e (diff) | |
| parent | 7c8c6864e33d0296194546ff626eb64b99e7cff8 (diff) | |
Merge "[POLICY] Uses new tpls for repos / images"
Diffstat (limited to 'kubernetes/policy/components/policy-nexus')
3 files changed, 5 insertions, 6 deletions
diff --git a/kubernetes/policy/components/policy-nexus/requirements.yaml b/kubernetes/policy/components/policy-nexus/requirements.yaml index d3c442d32e..0b77abe706 100755 --- a/kubernetes/policy/components/policy-nexus/requirements.yaml +++ b/kubernetes/policy/components/policy-nexus/requirements.yaml @@ -20,3 +20,6 @@ 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' diff --git a/kubernetes/policy/components/policy-nexus/templates/deployment.yaml b/kubernetes/policy/components/policy-nexus/templates/deployment.yaml index 9b76e06be8..3d5d59fea2 100755 --- a/kubernetes/policy/components/policy-nexus/templates/deployment.yaml +++ b/kubernetes/policy/components/policy-nexus/templates/deployment.yaml @@ -38,7 +38,7 @@ spec: spec: initContainers: - command: ["sh", "-c", "chown -R 200:200 /share"] - image: "{{ .Values.global.ubuntuInitRepository }}/{{ .Values.global.ubuntuInitImage }}" + image: {{ include "repositoryGenerator.image.busybox" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-init volumeMounts: @@ -46,7 +46,7 @@ spec: name: nexus-data containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.externalPort }} diff --git a/kubernetes/policy/components/policy-nexus/values.yaml b/kubernetes/policy/components/policy-nexus/values.yaml index 69be914bd4..7801b525f2 100755 --- a/kubernetes/policy/components/policy-nexus/values.yaml +++ b/kubernetes/policy/components/policy-nexus/values.yaml @@ -18,16 +18,12 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 - ubuntuInitRepository: oomk8s - ubuntuInitImage: ubuntu-init:1.0.0 persistence: {} ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: sonatype/nexus:2.14.13-01 pullPolicy: Always |