[POLICY] OOM Jakarta changes for PAP,API & PDPs

[oom.git] / kubernetes / policy / components / policy-drools-pdp / values.yaml

diff --git a/kubernetes/policy/components/policy-drools-pdp/values.yaml b/kubernetes/policy/components/policy-drools-pdp/values.yaml
index 61532fa..2ce7503 100755 (executable)
--- a/kubernetes/policy/components/policy-drools-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml
@@ -1,5 +1,6 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018-2020 AT&T Intellectual Property
+# Copyright © 2017 Amdocs
+# Copyright © 2017, 2021 Bell Canada
+# Modifications Copyright © 2018-2021 AT&T Intellectual Property
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,10 +19,6 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  readinessImage: onap/oom/readiness:3.0.1
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
-  ubuntuImage: ubuntu:16.04
 
 #################################################################
 # Secrets metaconfig
@@ -38,8 +35,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-repository: nexus3.onap.org:10001
-image: onap/policy-pdpd-cl:1.7.4
+image: onap/policy-pdpd-cl:1.10.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -91,14 +87,12 @@ certInitializer:
   cadi_longitude: "0.0"
   credsPath: /opt/app/osaaf/local
   app_ns: org.osaaf.aaf
-  uid: 1000
-  gid: 1000
+  uid: 100
+  gid: 101
   aaf_add_config: >
-    /opt/app/aaf_config/bin/agent.sh;
-    export $(/opt/app/aaf_config/bin/agent.sh local showpass
-    {{ .Values.fqi }} {{ .Values.fqdn }} | grep "^cadi_keystore_password_p12");
     echo "export KEYSTORE='{{ .Values.credsPath }}/org.onap.policy.p12'" >> {{ .Values.credsPath }}/.ci;
     echo "export KEYSTORE_PASSWD='${cadi_keystore_password_p12}'" >> {{ .Values.credsPath }}/.ci;
+    echo "export CADI_KEYFILE='{{ .Values.credsPath }}/org.onap.policy.keyfile'" >> {{ .Values.credsPath }}/.ci;
     chown -R {{ .Values.uid }}:{{ .Values.gid }} $(dirname {{ .Values.credsPath }});
 
 server:
@@ -130,7 +124,7 @@ db:
   password: policy_user
 
 pap:
-  user: healthcheck
+  user: policyadmin
   password: zb!XztG34
 
 pdp:
@@ -195,3 +189,9 @@ resources:
       cpu: 200m
       memory: 2Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: policy-drools-pdp
+  roles:
+    - read