summaryrefslogtreecommitdiffstats
path: root/kubernetes/policy/components/policy-xacml-pdp
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-19 18:02:37 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-27 14:18:19 +0000
commit7c8c6864e33d0296194546ff626eb64b99e7cff8 (patch)
tree2ba0d12715c02269ed413112258a643b59c5daa3 /kubernetes/policy/components/policy-xacml-pdp
parenta6fa6b1fe4c8c9b8e2a3e29b364dc96804404a9c (diff)
[POLICY] Uses new tpls for repos / images
This commit makes Policy 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: Ibc592fdc393e37c075ce905027d49d70fcbe4d84
Diffstat (limited to 'kubernetes/policy/components/policy-xacml-pdp')
-rwxr-xr-xkubernetes/policy/components/policy-xacml-pdp/requirements.yaml3
-rwxr-xr-xkubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml6
-rwxr-xr-xkubernetes/policy/components/policy-xacml-pdp/values.yaml3
3 files changed, 6 insertions, 6 deletions
diff --git a/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml b/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml
index c9502372be..6191c3e83c 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml
@@ -23,3 +23,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-xacml-pdp/templates/deployment.yaml b/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml
index e8473d2125..449d84b9e8 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml
@@ -51,7 +51,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
- command:
@@ -77,13 +77,13 @@ spec:
name: pdpxconfig
- mountPath: /config
name: pdpxconfig-processed
- 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 }}
{{- if .Values.global.aafEnabled }}
command: ["bash","-c"]
diff --git a/kubernetes/policy/components/policy-xacml-pdp/values.yaml b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
index 24be6c75c4..acc1d55002 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
@@ -21,9 +21,7 @@
#################################################################
global:
persistence: {}
- envsubstImage: dibi/envsubst
aafEnabled: true
- readinessImage: onap/oom/readiness:3.0.1
#################################################################
# Secrets metaconfig
@@ -88,7 +86,6 @@ certInitializer:
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/policy-xacml-pdp:2.3.3
pullPolicy: Always