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-apex-pdp | |
parent | 6f1cdc1aee56e11d8c05e569e5f5f31351b5fb1e (diff) | |
parent | 7c8c6864e33d0296194546ff626eb64b99e7cff8 (diff) |
Merge "[POLICY] Uses new tpls for repos / images"
Diffstat (limited to 'kubernetes/policy/components/policy-apex-pdp')
3 files changed, 5 insertions, 5 deletions
diff --git a/kubernetes/policy/components/policy-apex-pdp/requirements.yaml b/kubernetes/policy/components/policy-apex-pdp/requirements.yaml index 86751eae3c..506933cdf6 100755 --- a/kubernetes/policy/components/policy-apex-pdp/requirements.yaml +++ b/kubernetes/policy/components/policy-apex-pdp/requirements.yaml @@ -24,3 +24,6 @@ dependencies: - name: certInitializer version: ~6.x-0 repository: '@local' + - name: repositoryGenerator + version: ~6.x-0 + repository: '@local' diff --git a/kubernetes/policy/components/policy-apex-pdp/templates/statefulset.yaml b/kubernetes/policy/components/policy-apex-pdp/templates/statefulset.yaml index e9895c209b..08c1ba2db6 100755 --- a/kubernetes/policy/components/policy-apex-pdp/templates/statefulset.yaml +++ b/kubernetes/policy/components/policy-apex-pdp/templates/statefulset.yaml @@ -61,13 +61,13 @@ spec: name: apexconfig-input - mountPath: /config name: apexconfig - image: "{{ .Values.global.envsubstImage }}" + image: {{ include "repositoryGenerator.image.envsubst" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-update-config {{ include "common.certInitializer.initContainer" . | indent 6 }} containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: ["bash","-c"] args: ["if [ -f {{ .Values.certInitializer.credsPath }}/.ci ]; then \ diff --git a/kubernetes/policy/components/policy-apex-pdp/values.yaml b/kubernetes/policy/components/policy-apex-pdp/values.yaml index 23788e2532..6b13133815 100755 --- a/kubernetes/policy/components/policy-apex-pdp/values.yaml +++ b/kubernetes/policy/components/policy-apex-pdp/values.yaml @@ -22,8 +22,6 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 - envsubstImage: dibi/envsubst aafEnabled: true persistence: {} @@ -51,7 +49,6 @@ secrets: # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/policy-apex-pdp:2.4.4 pullPolicy: Always |