4 files changed, 6 insertions, 31 deletions
diff --git a/kubernetes/policy/components/policy-pap/Chart.yaml b/kubernetes/policy/components/policy-pap/Chart.yaml
index 29f9ed3e72..58ecf66e3a 100755..100644
--- a/kubernetes/policy/components/policy-pap/Chart.yaml
+++ b/kubernetes/policy/components/policy-pap/Chart.yaml
@@ -2,7 +2,7 @@
 #   Copyright (C) 2019 Nordix Foundation.
 #   Modified Copyright (C) 2020 AT&T Intellectual Property.
 #   Modifications Copyright © 2021 Orange
-#   Modifications Copyright © 2021, 2024 Nordix Foundation
+#   Modifications Copyright © 2021, 2024-2025 Nordix Foundation
 #   Modifications Copyright © 2024 Deutsche Telekom
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,7 +23,7 @@
 apiVersion: v2
 description: ONAP Policy Administration (PAP)
 name: policy-pap
-version: 15.0.0
+version: 16.0.0
 
 dependencies:
   - name: common
diff --git a/kubernetes/policy/components/policy-pap/resources/config/papParameters.yaml b/kubernetes/policy/components/policy-pap/resources/config/papParameters.yaml
index 58dfc9f497..72c8ad5fc3 100644
--- a/kubernetes/policy/components/policy-pap/resources/config/papParameters.yaml
+++ b/kubernetes/policy/components/policy-pap/resources/config/papParameters.yaml
@@ -1,6 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2022 Bell Canada. All rights reserved.
-#   Modifications Copyright © 2022-2024 Nordix Foundation
+#   Modifications Copyright © 2022-2025 Nordix Foundation
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -26,20 +26,6 @@ spring:
     converters:
       preferred-json-mapper: gson
   datasource:
-{{ if .Values.global.mariadbGalera.useInPolicy }}
-    url: jdbc:mariadb://{{ .Values.db.service.name }}:{{ .Values.db.service.internalPort }}/policyadmin
-    driverClassName: org.mariadb.jdbc.Driver
-    username: "${SQL_USER}"
-    password: "${SQL_PASSWORD}"
-    hikari:
-      maximumPoolSize: 20
-  jpa:
-    hibernate:
-      ddl-auto: none
-      naming:
-        physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-        implicit-strategy: org.onap.policy.common.spring.utils.CustomImplicitNamingStrategy
-{{- else }}
     url: jdbc:postgresql://{{ .Values.db.service.pgName }}:{{ .Values.db.service.internalPgPort }}/policyadmin
     driverClassName: org.postgresql.Driver
     username: "${SQL_USER}"
@@ -55,7 +41,6 @@ spring:
       naming:
         physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
         implicit-strategy: org.onap.policy.common.spring.utils.CustomImplicitNamingStrategy
-{{ end }}
 
 server:
   port: 6969
diff --git a/kubernetes/policy/components/policy-pap/templates/deployment.yaml b/kubernetes/policy/components/policy-pap/templates/deployment.yaml
index f7c400865f..e94e82764d 100644
--- a/kubernetes/policy/components/policy-pap/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-pap/templates/deployment.yaml
@@ -2,7 +2,7 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2020 AT&T Intellectual Property.
 #   Modifications Copyright (C) 2022 Bell Canada. All rights reserved.
-#   Modifications Copyright (C) 2024 Nordix Foundation.
+#   Modifications Copyright (C) 2024-2025 Nordix Foundation.
 #   Modifications Copyright © 2024 Deutsche Telekom
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,11 +36,7 @@ spec:
           - /app/ready.py
         args:
           - --job-name
-{{ if .Values.global.mariadbGalera.useInPolicy }}
-          - {{ include "common.release" . }}-policy-galera-migrator-config
-{{ else }}
           - {{ include "common.release" . }}-policy-pg-migrator-config
-{{ end }}
         env:
           - name: NAMESPACE
             valueFrom:
diff --git a/kubernetes/policy/components/policy-pap/values.yaml b/kubernetes/policy/components/policy-pap/values.yaml
index 2a5d938a01..345f061b83 100755..100644
--- a/kubernetes/policy/components/policy-pap/values.yaml
+++ b/kubernetes/policy/components/policy-pap/values.yaml
@@ -2,7 +2,7 @@
 #   Copyright (C) 2019 Nordix Foundation.
 #   Modifications Copyright (C) 2019-2021 AT&T Intellectual Property.
 #   Modifications Copyright (C) 2020-2022 Bell Canada. All rights reserved.
-#   Modifications Copyright © 2022-2024 Nordix Foundation
+#   Modifications Copyright © 2022-2025 Nordix Foundation
 #   Modifications Copyright © 2024 Deutsche Telekom
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,10 +26,6 @@
 global:
   nodePortPrefixExt: 304
   persistence: {}
-  postgres:
-    useInPolicy: false
-  mariadbGalera:
-    useInPolicy: true
 
 #################################################################
 # Secrets metaconfig
@@ -71,7 +67,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-pap:4.0.1
+image: onap/policy-pap:4.1.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -83,9 +79,7 @@ db:
   user: policy-user
   password: policy_user
   service:
-    name: policy-mariadb
     pgName: policy-pg-primary
-    internalPort: 3306
     internalPgPort: 5432
 
 restServer: