summaryrefslogtreecommitdiffstats
path: root/kubernetes/policy/components/policy-drools-pdp
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-09-14 11:27:12 +0000
committerGerrit Code Review <gerrit@onap.org>2020-09-14 11:27:12 +0000
commit6ff14bd39dd872726da1fb4383e139120ce6f381 (patch)
treebfce1ff7533ee1067c4c0e2a0ee1d11d26d756f0 /kubernetes/policy/components/policy-drools-pdp
parentf7d5e4f88fd8f9a0ac00ee47a2670d1ae18ff211 (diff)
parentbf8d8a97c59e8b866d4ac439e828aab4e4802751 (diff)
Merge "[POLICY] new image versions"
Diffstat (limited to 'kubernetes/policy/components/policy-drools-pdp')
-rwxr-xr-xkubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf1
-rwxr-xr-xkubernetes/policy/components/policy-drools-pdp/resources/secrets/credentials.conf3
-rwxr-xr-xkubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml1
-rwxr-xr-xkubernetes/policy/components/policy-drools-pdp/values.yaml2
4 files changed, 6 insertions, 1 deletions
diff --git a/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf b/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf
index 184ae9aee7..a0f5ceb777 100755
--- a/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf
+++ b/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf
@@ -57,6 +57,7 @@ PDPD_CONFIGURATION_PARTITION_KEY=
POLICY_PDP_PAP_TOPIC=POLICY-PDP-PAP
POLICY_PDP_PAP_GROUP=defaultGroup
+POLICY_PDP_PAP_POLICYTYPES=onap.policies.controlloop.operational.common.Drools
# Symmetric Key for encoded sensitive data
diff --git a/kubernetes/policy/components/policy-drools-pdp/resources/secrets/credentials.conf b/kubernetes/policy/components/policy-drools-pdp/resources/secrets/credentials.conf
index bb2b90c1a7..17efdbc44e 100755
--- a/kubernetes/policy/components/policy-drools-pdp/resources/secrets/credentials.conf
+++ b/kubernetes/policy/components/policy-drools-pdp/resources/secrets/credentials.conf
@@ -16,7 +16,10 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
+{{- if not .Values.global.aafEnabled }}
KEYSTORE_PASSWD={{.Values.keystore.password}}
+{{- end }}
+
TRUSTSTORE_PASSWD={{.Values.truststore.password}}
TELEMETRY_USER={{.Values.telemetry.user}}
diff --git a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
index 5828be48d7..1498d273b2 100755
--- a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
@@ -74,6 +74,7 @@ spec:
command: ["bash","-c"]
args: ["if [ -f {{ .Values.certInitializer.credsPath }}/.ci ]; then \
source {{ .Values.certInitializer.credsPath }}/.ci; fi;\
+ cp {{ .Values.certInitializer.credsPath }}/org.onap.policy.p12 ${POLICY_HOME}/etc/ssl/policy-keystore;\
/opt/app/policy/bin/pdpd-cl-entrypoint.sh boot"]
ports:
- containerPort: {{ .Values.service.externalPort }}
diff --git a/kubernetes/policy/components/policy-drools-pdp/values.yaml b/kubernetes/policy/components/policy-drools-pdp/values.yaml
index 8a8e3c23a4..5e8c8be179 100755
--- a/kubernetes/policy/components/policy-drools-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml
@@ -39,7 +39,7 @@ secrets:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/policy-pdpd-cl:1.7.0
+image: onap/policy-pdpd-cl:1.7.1
pullPolicy: Always
# flag to enable debugging - application support required