From d2b9ed817d996668976b943fc72be5647cf72e08 Mon Sep 17 00:00:00 2001 From: jhh Date: Tue, 10 Dec 2019 17:15:28 -0600 Subject: policy changes pre-1st policy release in frankfurt Miscellenous changes to keep up with all necessary oom modifications to support first set of released deliveries. PS1,PS6: PDP-D offline support. PS2: PDP-D PDP Group support. When PDPs register with PAP, they now have to specify their PDP group. Added the default group to the config file. PS3: PDP-A config file changes to add PDP group and native policy type. PS4, PS6: API add new preloaded policy types. PS5: Set snapshot versions for current release testing. PS[7-9]: https dmaap support for pap,pdp-x,distribution,pdp-a. PS10: PAP healthcheck configuration. PS11: Update LICENSE headers. PS12: Preload onap.policies.controlloop.operational.Common operational type. PS13: PDP-D drools base.conf remove JAVA_HOME PS14: add preloaded operational policies for apex in api component, and JDK 11 for legacy engine components. PS15: apex updated supported policy types, and remove duplicate preloaded policy type from api (operational Common). PS16: added api preloaded policy. PS17: distribution + more api preloaded policies PS18: amsterdam.pre.sh point to pdpd-cl-entrypoint.sh PS19: rebase and remove references to amsterdam in drools (deprecated) PS21: replace url with host/port for new actor design PS22: add trailing "/" to context URIs PS23: restore SO_URL as it may be needed for old actors/rules PS24: update to released images PS25: updated brmsgw.conf to latest images Issue-ID: POLICY-2296 Change-Id: I52232f65db19a50dd3c9baf052242c6d79675264 Signed-off-by: jhh Signed-off-by: Jim Hahn Signed-off-by: jhh --- .../charts/policy-api/resources/config/config.json | 36 ++++++++++++++++++++-- kubernetes/policy/charts/policy-api/values.yaml | 4 +-- 2 files changed, 36 insertions(+), 4 deletions(-) (limited to 'kubernetes/policy/charts/policy-api') diff --git a/kubernetes/policy/charts/policy-api/resources/config/config.json b/kubernetes/policy/charts/policy-api/resources/config/config.json index 8952ae86d8..ccfc07ae67 100644 --- a/kubernetes/policy/charts/policy-api/resources/config/config.json +++ b/kubernetes/policy/charts/policy-api/resources/config/config.json @@ -1,5 +1,5 @@ # ============LICENSE_START======================================================= -# Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -33,5 +33,37 @@ "databaseUser": "{{ .Values.global.mariadb.config.userName }}", "databasePassword": "{{ .Values.global.mariadb.config.userPassword | b64enc }}", "persistenceUnit": "PolicyMariaDb" - } + }, + "preloadPolicyTypes": [ + "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml", + "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml", + "policytypes/onap.policies.Optimization.yaml", + "policytypes/onap.policies.optimization.Resource.yaml", + "policytypes/onap.policies.optimization.Service.yaml", + "policytypes/onap.policies.optimization.resource.AffinityPolicy.yaml", + "policytypes/onap.policies.optimization.resource.DistancePolicy.yaml", + "policytypes/onap.policies.optimization.resource.HpaPolicy.yaml", + "policytypes/onap.policies.optimization.resource.OptimizationPolicy.yaml", + "policytypes/onap.policies.optimization.resource.PciPolicy.yaml", + "policytypes/onap.policies.optimization.service.QueryPolicy.yaml", + "policytypes/onap.policies.optimization.service.SubscriberPolicy.yaml", + "policytypes/onap.policies.optimization.resource.Vim_fit.yaml", + "policytypes/onap.policies.optimization.resource.VnfPolicy.yaml", + "policytypes/onap.policies.controlloop.guard.Common.yaml", + "policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml", + "policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml", + "policytypes/onap.policies.controlloop.guard.common.MinMax.yaml", + "policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml", + "policytypes/onap.policies.controlloop.Operational.yaml", + "policytypes/onap.policies.Naming.yaml", + "policytypes/onap.policies.native.Drools.yaml", + "policytypes/onap.policies.native.Xacml.yaml", + "policytypes/onap.policies.native.Apex.yaml", + "policytypes/onap.policies.controlloop.operational.Common.yaml", + "policytypes/onap.policies.controlloop.operational.common.Apex.yaml", + "policytypes/onap.policies.controlloop.operational.common.Drools.yaml" + ], + "preloadPolicies" : [ + "policies/sdnc.policy.naming.input.tosca.yaml" + ] } diff --git a/kubernetes/policy/charts/policy-api/values.yaml b/kubernetes/policy/charts/policy-api/values.yaml index 3a55227d81..b5e10493dc 100644 --- a/kubernetes/policy/charts/policy-api/values.yaml +++ b/kubernetes/policy/charts/policy-api/values.yaml @@ -1,5 +1,5 @@ # ============LICENSE_START======================================================= -# Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ global: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/policy-api:2.1.2 +image: onap/policy-api:2.2.1 pullPolicy: Always # flag to enable debugging - application support required -- cgit 1.2.3-korg