aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/policy/components/policy-pap
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-11-30 09:17:45 +0000
committerGerrit Code Review <gerrit@onap.org>2020-11-30 09:17:45 +0000
commitcfe8a79535c8972179638be2ed8bbc00210dd5dc (patch)
tree9113fb725cee208ba85e0c4d0f02290080d969be /kubernetes/policy/components/policy-pap
parent6f1cdc1aee56e11d8c05e569e5f5f31351b5fb1e (diff)
parent7c8c6864e33d0296194546ff626eb64b99e7cff8 (diff)
Merge "[POLICY] Uses new tpls for repos / images"
Diffstat (limited to 'kubernetes/policy/components/policy-pap')
-rwxr-xr-xkubernetes/policy/components/policy-pap/requirements.yaml3
-rwxr-xr-xkubernetes/policy/components/policy-pap/templates/deployment.yaml6
-rwxr-xr-xkubernetes/policy/components/policy-pap/values.yaml3
3 files changed, 6 insertions, 6 deletions
diff --git a/kubernetes/policy/components/policy-pap/requirements.yaml b/kubernetes/policy/components/policy-pap/requirements.yaml
index aa47b48548..334988ea4e 100755
--- a/kubernetes/policy/components/policy-pap/requirements.yaml
+++ b/kubernetes/policy/components/policy-pap/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-pap/templates/deployment.yaml b/kubernetes/policy/components/policy-pap/templates/deployment.yaml
index 4f90d81b3b..85312bcdfd 100755
--- a/kubernetes/policy/components/policy-pap/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-pap/templates/deployment.yaml
@@ -39,7 +39,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:
@@ -69,13 +69,13 @@ spec:
name: papconfig
- mountPath: /config
name: papconfig-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-pap/values.yaml b/kubernetes/policy/components/policy-pap/values.yaml
index 796fcd0a9f..0ab62ffa66 100755
--- a/kubernetes/policy/components/policy-pap/values.yaml
+++ b/kubernetes/policy/components/policy-pap/values.yaml
@@ -24,9 +24,7 @@
global:
nodePortPrefixExt: 304
persistence: {}
- envsubstImage: dibi/envsubst
aafEnabled: true
- readinessImage: onap/oom/readiness:3.0.1
#################################################################
# Secrets metaconfig
@@ -97,7 +95,6 @@ certInitializer:
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/policy-pap:2.3.3
pullPolicy: Always