[POLICY] Update helm charts with latest released versions

- use R16 interim release versions for policy components
- remove mariadb configurations for policy
- remove execute permissions for yaml config files

Issue-ID: POLICY-5285
Change-Id: I8cab7d7a2509286555634b851efb7fc13d314049
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index 2b303c6..c0f1a77 100644 (file)
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -61,7 +61,7 @@ dependencies:
     repository: '@local'
     condition: multicloud.enabled
   - name: policy
-    version: ~15.x-0
+    version: ~16.x-0
     repository: '@local'
     condition: policy.enabled
   - name: portal-ng

diff --git a/kubernetes/policy/Chart.yaml b/kubernetes/policy/Chart.yaml
old mode 100755 (executable)
new mode 100644 (file)
index 6a2e819..65a4679
--- a/kubernetes/policy/Chart.yaml
+++ b/kubernetes/policy/Chart.yaml
@@ -1,7 +1,7 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018, 2020 AT&T
 # Modifications Copyright © 2021 Orange
-# Modifications Copyright © 2021-2024 Nordix Foundation
+# Modifications Copyright © 2021-2025 Nordix Foundation
 # Modifications Copyright © 2024 Deutsche Telekom
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,38 +19,34 @@
 apiVersion: v2
 description: ONAP Policy
 name: policy
-version: 15.0.2
+version: 16.0.0
 
 dependencies:
   - name: common
     version: ~13.x-0
     repository: '@local'
-  - name: mariadb-galera
-    version: ~13.x-0
-    repository: '@local'
-    condition: global.mariadbGalera.localCluster
   - name: policy-nexus
     version: ~15.x-0
     repository: 'file://components/policy-nexus'
     condition: policy-nexus.enabled
   - name: policy-api
-    version: ~15.x-0
+    version: ~16.x-0
     repository: 'file://components/policy-api'
     condition: policy-api.enabled
   - name: policy-pap
-    version: ~15.x-0
+    version: ~16.x-0
     repository: 'file://components/policy-pap'
     condition: policy-pap.enabled
   - name: policy-xacml-pdp
-    version: ~15.x-0
+    version: ~16.x-0
     repository: 'file://components/policy-xacml-pdp'
     condition: policy-xacml-pdp.enabled
   - name: policy-apex-pdp
-    version: ~15.x-0
+    version: ~16.x-0
     repository: 'file://components/policy-apex-pdp'
     condition: policy-apex-pdp.enabled
   - name: policy-drools-pdp
-    version: ~15.x-0
+    version: ~16.x-0
     repository: 'file://components/policy-drools-pdp'
     condition: policy-drools-pdp.enabled
   - name: policy-opa-pdp
@@ -58,31 +54,31 @@ dependencies:
     repository: 'file://components/policy-opa-pdp'
     condition: policy-opa-pdp.enabled
   - name: policy-distribution
-    version: ~15.x-0
+    version: ~16.x-0
     repository: 'file://components/policy-distribution'
     condition: policy-distribution.enabled
   - name: policy-clamp-ac-k8s-ppnt
-    version: ~15.x-0
+    version: ~16.x-0
     repository: 'file://components/policy-clamp-ac-k8s-ppnt'
     condition: policy-clamp-ac-k8s-ppnt.enabled
   - name: policy-clamp-ac-http-ppnt
-    version: ~15.x-0
+    version: ~16.x-0
     repository: 'file://components/policy-clamp-ac-http-ppnt'
     condition: policy-clamp-ac-http-ppnt.enabled
   - name: policy-clamp-ac-a1pms-ppnt
-    version: ~15.x-0
+    version: ~16.x-0
     repository: 'file://components/policy-clamp-ac-a1pms-ppnt'
     condition: policy-clamp-ac-a1pms-ppnt.enabled
   - name: policy-clamp-ac-kserve-ppnt
-    version: ~15.x-0
+    version: ~16.x-0
     repository: 'file://components/policy-clamp-ac-kserve-ppnt'
     condition: policy-clamp-ac-kserve-ppnt.enabled
   - name: policy-clamp-ac-pf-ppnt
-    version: ~15.x-0
+    version: ~16.x-0
     repository: 'file://components/policy-clamp-ac-pf-ppnt'
     condition: policy-clamp-ac-pf-ppnt.enabled
   - name: policy-clamp-runtime-acm
-    version: ~15.x-0
+    version: ~16.x-0
     repository: 'file://components/policy-clamp-runtime-acm'
     condition: policy-clamp-runtime-acm.enabled
   - name: repositoryGenerator

diff --git a/kubernetes/policy/components/policy-apex-pdp/Chart.yaml b/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
old mode 100755 (executable)
new mode 100644 (file)
index 3cd9ef8..2ca9b30
--- a/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
@@ -1,7 +1,7 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
 #   Modifications Copyright © 2021 Orange
-#   Modifications Copyright © 2021,2024 Nordix Foundation
+#   Modifications Copyright © 2021, 2024-2025 Nordix Foundation
 #   Modification (C) 2023-2024 Deutsche Telekom. All rights reserved.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +22,7 @@
 apiVersion: v2
 description: ONAP Policy APEX PDP
 name: policy-apex-pdp
-version: 15.0.0
+version: 16.0.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/policy/components/policy-apex-pdp/values.yaml b/kubernetes/policy/components/policy-apex-pdp/values.yaml
old mode 100755 (executable)
new mode 100644 (file)
index 9cf89b4..bad6318
--- a/kubernetes/policy/components/policy-apex-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/values.yaml
@@ -1,7 +1,7 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
 #   Modifications Copyright (C) 2019-2021 AT&T Intellectual Property.
-#   Modifications Copyright © 2022 Nordix Foundation
+#   Modifications Copyright © 2022, 2025 Nordix Foundation
 #   Modification (C) 2023-2024 Deutsche Telekom. All rights reserved.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -47,7 +47,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-apex-pdp:4.0.1
+image: onap/policy-apex-pdp:4.1.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-api/Chart.yaml b/kubernetes/policy/components/policy-api/Chart.yaml
old mode 100755 (executable)
new mode 100644 (file)
index 6c3351a..859c343
--- a/kubernetes/policy/components/policy-api/Chart.yaml
+++ b/kubernetes/policy/components/policy-api/Chart.yaml
@@ -1,7 +1,7 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
 #   Modifications Copyright © 2021 Orange
-#   Modifications Copyright © 2021, 2024 Nordix Foundation
+#   Modifications Copyright © 2021, 2024-2025 Nordix Foundation
 #   Modification (C) 2023-2024 Deutsche Telekom. All rights reserved.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +22,7 @@
 apiVersion: v2
 description: ONAP Policy Design API
 name: policy-api
-version: 15.0.1
+version: 16.0.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/policy/components/policy-api/resources/config/apiParameters.yaml b/kubernetes/policy/components/policy-api/resources/config/apiParameters.yaml
index 3e357a6..fac2434 100644 (file)
--- a/kubernetes/policy/components/policy-api/resources/config/apiParameters.yaml
+++ b/kubernetes/policy/components/policy-api/resources/config/apiParameters.yaml
@@ -2,7 +2,7 @@
 #   Copyright (C) 2022 Bell Canada. All rights reserved.
 #   Modifications Copyright (C) 2022 AT&T Intellectual Property.
 #   Modification (C) 2023 Deutsche Telekom. All rights reserved.
-#   Modifications Copyright © 2024 Nordix Foundation.
+#   Modifications Copyright © 2024-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.
@@ -32,20 +32,6 @@ spring:
     password: "${RESTSERVER_PASSWORD}"
   mvc.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}"
@@ -61,21 +47,11 @@ spring:
       naming:
         physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
         implicit-strategy: org.onap.policy.common.spring.utils.CustomImplicitNamingStrategy
-{{ end }}
 
 policy-api:
   name: ApiGroup
   aaf: false
 
-database:
-  name: PolicyProviderParameterGroup
-  implementation: org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl
-  driver: org.mariadb.jdbc.Driver
-  url: jdbc:mariadb://{{ .Values.db.service.name }}/policyadmin
-  user: "${SQL_USER}"
-  password: "${SQL_PASSWORD}"
-  persistenceUnit: PolicyDb
-
 policy-preload:
   policyTypes:
     - policytypes/onap.policies.monitoring.tcagen2.yaml

diff --git a/kubernetes/policy/components/policy-api/templates/deployment.yaml b/kubernetes/policy/components/policy-api/templates/deployment.yaml
index f89945f..063bc80 100755 (executable)
--- a/kubernetes/policy/components/policy-api/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-api/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{/*
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021-2024 Nordix Foundation.
+#   Copyright (C) 2021-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.
@@ -33,11 +33,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-api/values.yaml b/kubernetes/policy/components/policy-api/values.yaml
old mode 100755 (executable)
new mode 100644 (file)
index 3e86ed1..7e3aa51
--- a/kubernetes/policy/components/policy-api/values.yaml
+++ b/kubernetes/policy/components/policy-api/values.yaml
@@ -2,7 +2,7 @@
 #   Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
 #   Modifications Copyright (C) 2022 Bell Canada. All rights reserved.
 #   Modification (C) 2023-2024 Deutsche Telekom. All rights reserved.
-#   Modifications Copyright © 2024 Nordix Foundation.
+#   Modifications Copyright © 2024-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.
@@ -25,10 +25,6 @@
 global:
   nodePortPrefix: 304
   persistence: {}
-  postgres:
-    useInPolicy: false
-  mariadbGalera:
-    useInPolicy: true
 
 #################################################################
 # Secrets metaconfig
@@ -51,7 +47,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-api:4.0.1
+image: onap/policy-api:4.1.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -62,9 +58,7 @@ db:
   user: policy-user
   password: policy_user
   service:
-    name: policy-mariadb
     pgName: policy-pg-primary
-    internalPort: 3306
     internalPgPort: 5432
 
 restServer:

diff --git a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/Chart.yaml
old mode 100755 (executable)
new mode 100644 (file)
index a89c614..665b301
--- a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/Chart.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#  Copyright (C) 2022-2024 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2022-2025 Nordix Foundation. All rights reserved.
 #  Modifications Copyright © 2024 Deutsche Telekom
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,7 @@
 apiVersion: v2
 description: ONAP Policy Clamp A1PMS Participant
 name: policy-clamp-ac-a1pms-ppnt
-version: 15.0.0
+version: 16.0.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
old mode 100755 (executable)
new mode 100644 (file)
index b882829..cee5eb8
--- a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2022-2024 Nordix Foundation.
+#   Copyright (C) 2022-2025 Nordix Foundation.
 #   Modifications Copyright © 2024 Deutsche Telekom
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +43,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-ac-a1pms-ppnt:8.0.1
+image: onap/policy-clamp-ac-a1pms-ppnt:8.1.0
 pullPolicy: Always
 
 componentName: &componentName policy-clamp-ac-a1pms-ppnt

diff --git a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml
index 1c3abbb..0bdc6b6 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021-2022, 2024 Nordix Foundation.
+#   Copyright (C) 2021-2022, 2024-2025 Nordix Foundation.
 #   Modifications Copyright © 2024 Deutsche Telekom
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,7 @@
 apiVersion: v2
 description: ONAP Policy Clamp Controlloop Http Participant
 name: policy-clamp-ac-http-ppnt
-version: 15.0.0
+version: 16.0.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml
index e7d317e..a422386 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021-2023 Nordix Foundation.
+#   Copyright (C) 2021-2023, 2025 Nordix Foundation.
 #   Modifications Copyright © 2024 Deutsche Telekom
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -44,7 +44,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-ac-http-ppnt:8.0.1
+image: onap/policy-clamp-ac-http-ppnt:8.1.0
 pullPolicy: Always
 
 componentName: &componentName policy-clamp-ac-http-ppnt

diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml
index 09dadf2..9abe71d 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#  Copyright (C) 2021 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2021, 2025 Nordix Foundation. All rights reserved.
 #  Modifications Copyright © 2021 Orange
 #  Modifications Copyright © 2021-2022, 2024 Nordix Foundation
 #  Modifications Copyright © 2024 Deutsche Telekom
@@ -22,7 +22,7 @@
 apiVersion: v2
 description: ONAP Policy Clamp Controlloop K8s Participant
 name: policy-clamp-ac-k8s-ppnt
-version: 15.0.0
+version: 16.0.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
index ea00a34..c9f3f9b 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#  Copyright (C) 2021-2024 Nordix Foundation.
+#  Copyright (C) 2021-2025 Nordix Foundation.
 #  Modifications Copyright © 2024 Deutsche Telekom
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,7 +45,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-ac-k8s-ppnt:8.0.1
+image: onap/policy-clamp-ac-k8s-ppnt:8.1.0
 pullPolicy: Always
 
 componentName: &componentName policy-clamp-ac-k8s-ppnt

diff --git a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/Chart.yaml
old mode 100755 (executable)
new mode 100644 (file)
index 2982043..49a6e4d
--- a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/Chart.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#  Copyright (C) 2023-2024 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2023-2025 Nordix Foundation. All rights reserved.
 #  Modifications Copyright © 2024 Deutsche Telekom
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,7 @@
 apiVersion: v2
 description: ONAP Policy Clamp Kserve Participant
 name: policy-clamp-ac-kserve-ppnt
-version: 15.0.0
+version: 16.0.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
old mode 100755 (executable)
new mode 100644 (file)
index 2221ce8..61cc461
--- a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2023 Nordix Foundation.
+#   Copyright (C) 2023, 2025 Nordix Foundation.
 #   Modifications Copyright © 2024 Deutsche Telekom
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -44,7 +44,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-ac-kserve-ppnt:8.0.1
+image: onap/policy-clamp-ac-kserve-ppnt:8.1.0
 pullPolicy: Always
 
 componentName: &componentName policy-clamp-ac-kserve-ppnt

diff --git a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml
index 49d7522..5945f3b 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021-2022, 2024 Nordix Foundation.
+#   Copyright (C) 2021-2022, 2024-2025 Nordix Foundation.
 #   Modifications Copyright © 2024 Deutsche Telekom
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,7 @@
 apiVersion: v2
 description: ONAP Policy Clamp Controlloop Policy Participant
 name: policy-clamp-ac-pf-ppnt
-version: 15.0.0
+version: 16.0.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
index e7fbbb1..2bdbaa4 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021-2024 Nordix Foundation.
+#   Copyright (C) 2021-2025 Nordix Foundation.
 #   Modifications Copyright © 2024 Deutsche Telekom
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -56,7 +56,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-ac-pf-ppnt:8.0.1
+image: onap/policy-clamp-ac-pf-ppnt:8.1.0
 pullPolicy: Always
 
 componentName: &componentName policy-clamp-ac-pf-ppnt

diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml
index 8b22acd..5d26bfd 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021, 2024 Nordix Foundation. All rights reserved.
+#   Copyright (C) 2021, 2025 Nordix Foundation. All rights reserved.
 #   Modifications Copyright © 2021 Orange
 #   Modifications Copyright © 2021-2024 Nordix Foundation
 #   Modifications Copyright © 2024 Deutsche Telekom
@@ -22,7 +22,7 @@
 apiVersion: v2
 description: ONAP Policy Clamp Controlloop Runtime
 name: policy-clamp-runtime-acm
-version: 15.0.0
+version: 16.0.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
index f1785ac..a296e8c 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021-2024 Nordix Foundation.
+#   Copyright (C) 2021-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.
@@ -25,13 +25,8 @@ spring:
     converters:
       preferred-json-mapper: gson
   datasource:
-  {{ if .Values.global.mariadbGalera.useInPolicy }}
-    url: jdbc:mariadb://{{ .Values.db.service.mariadbName }}:{{ .Values.db.service.mariadbPort }}/clampacm
-    driverClassName: org.mariadb.jdbc.Driver
-  {{ else }}
     url: jdbc:postgresql://{{ .Values.db.service.pgName }}:{{ .Values.db.service.pgPort }}/clampacm
     driverClassName: org.postgresql.Driver
-  {{ end }}
     username: ${SQL_USER}
     password: ${SQL_PASSWORD}
     hikari:
@@ -47,11 +42,7 @@ spring:
         implicit-strategy: org.onap.policy.common.spring.utils.CustomImplicitNamingStrategy
     properties:
       hibernate:
-     {{ if .Values.global.mariadbGalera.useInPolicy }}
-        dialect: org.hibernate.dialect.MariaDBDialect
-    {{ else }}
         dialect: org.hibernate.dialect.PostgreSQLDialect
-    {{ end }}
         format_sql: true
 
 metrics:

diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
index 5a206b9..c09a361 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
@@ -1,6 +1,6 @@
 {{/*
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021-2024 Nordix Foundation.
+#   Copyright (C) 2021-2025 Nordix Foundation.
 #   Modifications Copyright © 2024 Deutsche Telekom
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,11 +34,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-clamp-runtime-acm/values.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
index 9f78b29..00bd0ac 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021-2024 Nordix Foundation.
+#   Copyright (C) 2021-2025 Nordix Foundation.
 #   Modifications Copyright © 2024 Deutsche Telekom
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,10 +23,6 @@
 global:
   nodePortPrefixExt: 304
   persistence: {}
-  postgres:
-    useInPolicy: false
-  mariadbGalera:
-    useInPolicy: true
   #Strimzi Kafka properties
   kafkaTopics:
     acRuntimeOperationTopic:
@@ -55,7 +51,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-runtime-acm:8.0.1
+image: onap/policy-clamp-runtime-acm:8.1.0
 pullPolicy: Always
 
 componentName: &componentName policy-clamp-runtime-acm
@@ -95,8 +91,6 @@ db:
   user: policy-user
   password: policy_user
   service:
-    mariadbName: policy-mariadb
-    mariadbPort: 3306
     pgName: policy-pg-primary
     pgPort: 5432
 

diff --git a/kubernetes/policy/components/policy-distribution/Chart.yaml b/kubernetes/policy/components/policy-distribution/Chart.yaml
old mode 100755 (executable)
new mode 100644 (file)
index 3ac1d03..a11ab99
--- a/kubernetes/policy/components/policy-distribution/Chart.yaml
+++ b/kubernetes/policy/components/policy-distribution/Chart.yaml
@@ -1,7 +1,7 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
 #   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");
@@ -22,7 +22,7 @@
 apiVersion: v2
 description: ONAP Policy Distribution
 name: policy-distribution
-version: 15.0.0
+version: 16.0.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/policy/components/policy-distribution/values.yaml b/kubernetes/policy/components/policy-distribution/values.yaml
old mode 100755 (executable)
new mode 100644 (file)
index f393250..d10cf19
--- a/kubernetes/policy/components/policy-distribution/values.yaml
+++ b/kubernetes/policy/components/policy-distribution/values.yaml
@@ -1,7 +1,7 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2018 Ericsson. All rights reserved.
 #   Modifications Copyright (C) 2019-2021 AT&T Intellectual Property.
-#   Modifications Copyright (C) 2023 Nordix Foundation
+#   Modifications Copyright (C) 2023, 2025 Nordix Foundation
 #   Modifications Copyright © 2024 Deutsche Telekom
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -59,7 +59,7 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-distribution:4.0.1
+image: onap/policy-distribution:4.1.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-drools-pdp/Chart.yaml b/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
old mode 100755 (executable)
new mode 100644 (file)
index 37ab25c..50c84c0
--- a/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
@@ -1,7 +1,7 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018, 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");
@@ -19,7 +19,7 @@
 apiVersion: v2
 description: ONAP Drools Policy Engine (PDP-D)
 name: policy-drools-pdp
-version: 15.0.0
+version: 16.0.0
 
 dependencies:
   - name: common

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 64e8188..b1a7f04 100644 (file)
--- a/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf
+++ b/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/base.conf
@@ -2,7 +2,7 @@
 # Copyright © 2017-2018 Amdocs, Bell Canada.
 # Modifications Copyright (C) 2018-2020, 2022 AT&T Intellectual Property.
 # Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
-# Modifications Copyright (C) 2024 Nordix Foundation.
+# Modifications Copyright (C) 2024-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.
@@ -41,21 +41,11 @@ REPOSITORY_OFFLINE={{.Values.nexus.offline}}
 
 # Relational (SQL) DB access
 
-{{ if .Values.global.mariadbGalera.useInPolicy }}
-SQL_HOST={{ .Values.db.mariadbName }}
-SQL_PORT={{ .Values.db.mariadbPort }}
-JDBC_URL=jdbc:mariadb://{{ .Values.db.mariadbName }}:{{ .Values.db.mariadbPort }}/
-JDBC_OPTS=
-JDBC_DRIVER=org.mariadb.jdbc.Driver
-MYSQL_CMD=
-{{ else }}
 SQL_HOST={{ .Values.db.pgName }}
 SQL_PORT={{ .Values.db.pgPort }}
 JDBC_URL=jdbc:postgresql://{{ .Values.db.pgName }}:{{ .Values.db.pgPort }}/
 JDBC_OPTS=
 JDBC_DRIVER=org.postgresql.Driver
-MYSQL_CMD=
-{{ end }}
 
 # Liveness
 LIVENESS_CONTROLLERS=*

diff --git a/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/feature-distributed-locking.properties b/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/feature-distributed-locking.properties
index d4577b5..64ac221 100644 (file)
--- a/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/feature-distributed-locking.properties
+++ b/kubernetes/policy/components/policy-drools-pdp/resources/configmaps/feature-distributed-locking.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # ONAP
 # ================================================================================
-# Copyright (C) 2024 Nordix Foundation.
+# Copyright (C) 2024-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.
@@ -19,17 +19,10 @@
 ###
 
 #Database properties
-{{ if .Values.global.mariadbGalera.useInPolicy }}
-jakarta.persistence.jdbc.driver=org.mariadb.jdbc.Driver
-jakarta.persistence.jdbc.url=${envd:JDBC_URL}pooling${envd:JDBC_OPTS}
-jakarta.persistence.jdbc.user=${envd:SQL_USER}
-jakarta.persistence.jdbc.password=${envd:SQL_PASSWORD}
-{{ else }}
 jakarta.persistence.jdbc.driver=org.postgresql.Driver
 jakarta.persistence.jdbc.url=${envd:JDBC_URL}pooling${envd:JDBC_OPTS}
 jakarta.persistence.jdbc.user=${envd:SQL_USER}
 jakarta.persistence.jdbc.password=${envd:SQL_PASSWORD}
-{{ end }}
 
 # default property values are commented out
 #distributed.locking.expire.check.seconds=900

diff --git a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
index a24476c..e8c0a5e 100644 (file)
--- a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
@@ -1,7 +1,7 @@
 {{/*
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018-2020, 2022 AT&T Intellectual Property
-# 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");
@@ -33,11 +33,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-drools-pdp/values.yaml b/kubernetes/policy/components/policy-drools-pdp/values.yaml
index 8fbd6c6..e367cfc 100644 (file)
--- a/kubernetes/policy/components/policy-drools-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml
@@ -1,7 +1,7 @@
 # Copyright © 2017 Amdocs
 # Copyright © 2017, 2021 Bell Canada
 # Modifications Copyright © 2018-2022 AT&T Intellectual Property
-# 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");
@@ -21,10 +21,7 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  postgres:
-    useInPolicy: false
-  mariadbGalera:
-    useInPolicy: true
+
 #################################################################
 # Secrets metaconfig
 #################################################################
@@ -47,7 +44,7 @@ secrets:
 #################################################################
 # application image
 # The newest images have been tested with SASL and Postgres. The images released next will have the relevant fixes
-image: onap/policy-pdpd-cl:3.0.1
+image: onap/policy-pdpd-cl:3.1.0
 
 pullPolicy: Always
 
@@ -107,11 +104,8 @@ nexus:
   offline: true
 
 db:
-  mariadbName: policy-mariadb
   pgName: policy-pg-primary
-  mariadbPort: 3306
   pgPort: 5432
-  user: policy-user
   password: policy_user
 
 pap:

diff --git a/kubernetes/policy/components/policy-nexus/Chart.yaml b/kubernetes/policy/components/policy-nexus/Chart.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/kubernetes/policy/components/policy-nexus/values.yaml b/kubernetes/policy/components/policy-nexus/values.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/kubernetes/policy/components/policy-opa-pdp/Chart.yaml b/kubernetes/policy/components/policy-opa-pdp/Chart.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/kubernetes/policy/components/policy-opa-pdp/values.yaml b/kubernetes/policy/components/policy-opa-pdp/values.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/kubernetes/policy/components/policy-pap/Chart.yaml b/kubernetes/policy/components/policy-pap/Chart.yaml
old mode 100755 (executable)
new mode 100644 (file)
index 29f9ed3..58ecf66
--- 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 58dfc9f..72c8ad5 100644 (file)
--- 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 f7c4008..e94e827 100644 (file)
--- 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
old mode 100755 (executable)
new mode 100644 (file)
index 2a5d938..345f061
--- 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:

diff --git a/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml b/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
old mode 100755 (executable)
new mode 100644 (file)
index f404612..a8236dc
--- a/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
@@ -1,7 +1,7 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
 #   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");
@@ -22,7 +22,7 @@
 apiVersion: v2
 description: ONAP Policy XACML PDP (PDP-X)
 name: policy-xacml-pdp
-version: 15.0.0
+version: 16.0.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/policy/components/policy-xacml-pdp/resources/config/xacml.properties b/kubernetes/policy/components/policy-xacml-pdp/resources/config/xacml.properties
index 478cf84..46d6b2a 100644 (file)
--- a/kubernetes/policy/components/policy-xacml-pdp/resources/config/xacml.properties
+++ b/kubernetes/policy/components/policy-xacml-pdp/resources/config/xacml.properties
@@ -1,6 +1,6 @@
 {{/*
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2024 Nordix Foundation. All rights reserved.
+#   Copyright (C) 2024-2025 Nordix Foundation. 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.
@@ -67,14 +67,8 @@ xacml.pip.engines=count-recent-operations,get-operation-outcome
 #
 # JPA Properties
 #
-{{ if .Values.global.mariadbGalera.useInPolicy }}
-eclipselink.target-database=MySQL
-jakarta.persistence.jdbc.driver=org.mariadb.jdbc.Driver
-jakarta.persistence.jdbc.url=jdbc:mariadb://{{ .Values.db.service.mariadbName }}:{{ .Values.db.service.mariadbPort }}/operationshistory
-{{ else }}
 eclipselink.target-database=PostgreSQL
 jakarta.persistence.jdbc.driver=org.postgresql.Driver
 jakarta.persistence.jdbc.url=jdbc:postgresql://{{ .Values.db.service.pgName }}:{{ .Values.db.service.pgPort }}/operationhistory
-{{ end }}
 jakarta.persistence.jdbc.user=${SQL_USER}
 jakarta.persistence.jdbc.password=${SQL_PASSWORD}

diff --git a/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml b/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml
index 828f6ec..4411762 100644 (file)
--- a/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml
@@ -1,7 +1,7 @@
 {{/*
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2020 AT&T Intellectual Property.
-#   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");
@@ -35,11 +35,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-xacml-pdp/values.yaml b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
index bdad532..4ec5322 100644 (file)
--- a/kubernetes/policy/components/policy-xacml-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
@@ -1,6 +1,6 @@
 #  ============LICENSE_START=======================================================
 #   Copyright (C) 2019-2021 AT&T Intellectual Property. 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");
@@ -23,10 +23,7 @@
 #################################################################
 global:
   persistence: {}
-  postgres:
-    useInPolicy: false
-  mariadbGalera:
-    useInPolicy: true
+
 #################################################################
 # Secrets metaconfig
 #################################################################
@@ -54,7 +51,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-xacml-pdp:4.0.1
+image: onap/policy-xacml-pdp:4.1.0
 pullPolicy: Always
 
 componentName: &componentName policy-xacml-pdp
@@ -68,8 +65,6 @@ db:
   user: policy-user
   password: policy_user
   service:
-    mariadbName: policy-mariadb
-    mariadbPort: 3306
     pgName: policy-pg-primary
     pgPort: 5432
 

diff --git a/kubernetes/policy/resources/config/db.sh b/kubernetes/policy/resources/config/db.sh
deleted file mode 100755 (executable)
index d793a02..0000000
--- a/kubernetes/policy/resources/config/db.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-{{/*
-# Copyright © 2017 Amdocs, Bell Canada, AT&T
-# Modifications Copyright © 2018, 2020 AT&T Intellectual Property
-# Modifications Copyright (C) 2021 Nordix Foundation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-mysqlcmd() { mysql  -h ${MYSQL_HOST} -P ${MYSQL_PORT} "$@"; };
-
-i=5
-RESULT_VARIABLE=0
-echo "Check if user ${MYSQL_USER} is created in DB ${MYSQL_HOST}"
-while [ $i -gt 0 ] && [ "$RESULT_VARIABLE" != 1 ]
-do
-  i=$(( i-1 ))
-  RESULT_VARIABLE="$(mysqlcmd -uroot -p"${MYSQL_ROOT_PASSWORD}" -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = '${MYSQL_USER}')")"
-  if [ "$RESULT_VARIABLE" = 1 ]; then
-    echo "User ${MYSQL_USER} exists"
-  else
-    echo "User ${MYSQL_USER} does not exist"
-    sleep 10
-  fi
-done
-if [ "$RESULT_VARIABLE" != 1 ]; then
-  exit 1
-fi
-for db in migration pooling policyadmin policyclamp operationshistory clampacm
-do
-    echo "Create DB ${db}"
-    mysqlcmd -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "CREATE DATABASE IF NOT EXISTS ${db};"
-    echo "Grand access for user ${MYSQL_USER}"
-    mysqlcmd -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "GRANT ALL PRIVILEGES ON \`${db}\`.* TO '${MYSQL_USER}'@'%' ;"
-done
-echo "Flush privileges"
-mysqlcmd -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "FLUSH PRIVILEGES;"

diff --git a/kubernetes/policy/resources/config/db_migrator_policy_init.sh b/kubernetes/policy/resources/config/db_migrator_policy_init.sh
deleted file mode 100644 (file)
index 32ccbf1..0000000
--- a/kubernetes/policy/resources/config/db_migrator_policy_init.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-{{/*
-# Copyright (C) 2021, 2024 Nordix Foundation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-for schema in ${SQL_DB}; do
-    echo "Initializing $schema..."
-    /opt/app/policy/bin/prepare_upgrade.sh ${schema}
-
-    /opt/app/policy/bin/db-migrator -s ${schema} -o report
-
-    /opt/app/policy/bin/db-migrator -s ${schema} -o upgrade
-    rc=$?
-
-    /opt/app/policy/bin/db-migrator -s ${schema} -o report
-
-    if [ "$rc" != 0 ]; then
-        break
-    fi
-done
-
-exit $rc

diff --git a/kubernetes/policy/templates/job.yaml b/kubernetes/policy/templates/job.yaml
index ad5b8fb..6fde506 100755 (executable)
--- a/kubernetes/policy/templates/job.yaml
+++ b/kubernetes/policy/templates/job.yaml
@@ -1,7 +1,7 @@
 {{/*
 # Copyright © 2018 Amdocs, Bell Canada
 # Modifications Copyright © 2020 AT&T Intellectual Property
-# Modifications Copyright (C) 2022-2024 Nordix Foundation.
+# Modifications Copyright (C) 2022-2025 Nordix Foundation.
 # Modifications Copyright © 2024 Deutsche Telekom
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,92 +17,6 @@
 # limitations under the License.
 */}}
 
-{{ if .Values.global.mariadbGalera.useInPolicy }}
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ include "common.fullname" . }}-galera-init
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}-galera-init
-    release: {{ include "common.release" . }}
-spec:
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.name" . }}-galera-init
-        release: {{ include "common.release" . }}
-      name: {{ include "common.name" . }}-galera-init
-    spec:
-      {{ include "common.podSecurityContext" . | indent 6 | trim }}
-      {{- include "common.imagePullSecrets" . | nindent 6 }}
-      initContainers:
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_mariadb ) | indent 6 | trim }}
-      containers:
-      - name: {{ include "common.name" . }}-galera-config
-        image: {{ include "repositoryGenerator.image.mariadb" . }}
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        {{ include "common.containerSecurityContext" . | indent 8 | trim }}
-        volumeMounts:
-        - mountPath: /dbcmd-config/db.sh
-          name: {{ include "common.fullname" . }}-config
-          subPath: db.sh
-        command:
-        - /bin/sh
-        - -cx
-        - |
-           {{- if include "common.requireSidecarKiller" . }}
-           echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
-           /dbcmd-config/db.sh
-        env:
-        - name: MYSQL_ROOT_PASSWORD
-          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-root-password" "key" "password") | indent 10 }}
-        - name: MYSQL_HOST
-          value: "{{ index .Values "mariadb-galera" "service" "name" }}"
-        - name: MYSQL_USER
-          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-secret" "key" "login") | indent 10 }}
-        - name: MYSQL_PORT
-          value: "{{ index .Values "mariadb-galera" "service" "internalPort" }}"
-        resources: {{ include "common.resources" . | nindent 10 }}
-      {{- if (include "common.requireSidecarKiller" .) }}
-      - name: policy-service-mesh-wait-for-job-container
-        image: {{ include "repositoryGenerator.image.quitQuit" . }}
-        imagePullPolicy: Always
-        {{ include "common.containerSecurityContext" . | indent 8 | trim }}
-        command:
-        - /bin/sh
-        - "-c"
-        args:
-        - echo "waiting 10s for istio side cars to be up"; sleep 10s;
-          /app/ready.py --service-mesh-check {{ include "common.name" . }}-galera-config -t 45;
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        {{ include "common.containerSecurityContext" . | indent 8 | trim }}
-        resources:
-          limits:
-            cpu: 100m
-            memory: 500Mi
-          requests:
-            cpu: 10m
-            memory: 10Mi
-      {{- end }}
-      restartPolicy: Never
-      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
-      volumes:
-        - name: {{ include "common.fullname" . }}-config
-          configMap:
-            name: {{ include "common.fullname" . }}-db-configmap
-            defaultMode: 0755
-            items:
-              - key: db.sh
-                path: db.sh
-{{ end }}
-
-{{ if .Values.global.postgres.useInPolicy }}
 ---
 apiVersion: batch/v1
 kind: Job
@@ -188,114 +102,8 @@ spec:
             items:
               - key: db-pg.sh
                 path: db-pg.sh
-{{ end }}
 ---
-{{ if .Values.global.mariadbGalera.useInPolicy }}
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ include "common.fullname" . }}-galera-migrator-config
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}-galera-migrator-config
-    release: {{ include "common.release" . }}
-spec:
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.name" . }}-galera-migrator-config
-        release: {{ include "common.release" . }}
-      name: {{ include "common.name" . }}-galera-migrator-config
-    spec:
-      {{ include "common.podSecurityContext" . | indent 6 | trim }}
-      {{- include "common.imagePullSecrets" . | nindent 6 }}
-      initContainers:
-        - name: {{ include "common.name" . }}-init-readiness
-          {{ include "common.containerSecurityContext" . | indent 10 | trim }}
-          image: {{ include "repositoryGenerator.image.readiness" . }}
-          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-          command:
-            - /app/ready.py
-          args:
-            - --job-name
-            - {{ include "common.fullname" . }}-galera-init
-          env:
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  apiVersion: v1
-                  fieldPath: metadata.namespace
-          resources:
-            limits:
-              cpu: "100m"
-              memory: "500Mi"
-            requests:
-              cpu: "3m"
-              memory: "20Mi"
-      containers:
-        - name: {{ include "common.name" . }}-galera-db-migrator
-          {{ include "common.containerSecurityContext" . | indent 10 | trim }}
-          image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.dbmigrator.image }}
-          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-          volumeMounts:
-            - mountPath: /opt/app/policy/etc/db/
-              name: {{ include "common.fullname" . }}-migration-writable
-            - mountPath: /dbcmd-config/db_migrator_policy_init.sh
-              name: {{ include "common.fullname" . }}-config
-              subPath: db_migrator_policy_init.sh
-          command:
-            - /bin/sh
-            - -cx
-            - |
-           {{- if include "common.requireSidecarKiller" . }}
-              echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
-              /dbcmd-config/db_migrator_policy_init.sh
-          env:
-          - name: SQL_HOST
-            value: "{{ index .Values "mariadb-galera" "service" "name" }}"
-          - name: SQL_USER
-            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-secret" "key" "login") | indent 12 }}
-          - name: SQL_PASSWORD
-            {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-secret" "key" "password") | indent 12 }}
-          - name: SQL_DB
-            value: {{ .Values.dbmigrator.schemas }}
-          - name: POLICY_HOME
-            value: {{ .Values.dbmigrator.policy_home }}
-          - name: SCRIPT_DIRECTORY
-            value: "sql"
-          resources: {{ include "common.resources" . | nindent 12 }}
-      {{- if (include "common.requireSidecarKiller" .) }}
-        - name: policy-service-mesh-wait-for-job-container
-          {{ include "common.containerSecurityContext" . | indent 10 | trim }}
-          image: {{ include "repositoryGenerator.image.quitQuit" . }}
-          imagePullPolicy: Always
-          command:
-            - /bin/sh
-            - "-c"
-          args:
-            - echo "waiting 10s for istio side cars to be up"; sleep 10s;
-              /app/ready.py --service-mesh-check {{ include "common.name" . }}-galera-db-migrator -t 45;
-          env:
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  apiVersion: v1
-                  fieldPath: metadata.namespace
-      {{- end }}
-      restartPolicy: Never
-      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
-      volumes:
-        - name: {{ include "common.fullname" . }}-migration-writable
-          emptyDir: {}
-        - name: {{ include "common.fullname" . }}-config
-          configMap:
-            name: {{ include "common.fullname" . }}-db-configmap
-            defaultMode: 0755
-            items:
-              - key: db_migrator_policy_init.sh
-                path: db_migrator_policy_init.sh
-{{ end }}
-{{ if .Values.global.postgres.useInPolicy }}
+
 ---
 apiVersion: batch/v1
 kind: Job
@@ -402,4 +210,3 @@ spec:
             items:
               - key: db_migrator_pg_policy_init.sh
                 path: db_migrator_pg_policy_init.sh
-{{ end }}

diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index 26d5e0e..407d990 100644 (file)
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -1,6 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018-2020 AT&T Intellectual Property
-# Modifications Copyright (C) 2021-2024 Nordix Foundation.
+# Modifications Copyright (C) 2021-2025 Nordix Foundation.
 # Modifications Copyright © 2024 Deutsche Telekom
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,26 +19,8 @@
 # Global configuration defaults.
 #################################################################
 global:
-  mariadbGalera:
-    useInPolicy: false
-    localCluster: true
-    # flag to enable the DB creation via mariadb-operator
-    useOperator: false
-    # if useOperator set to "true", set "enableServiceAccount to "false"
-    # as the SA is created by the Operator
-    enableServiceAccount: true
-    # '&mariadbConfig' means we "store" the values for  later use in the file
-    # with '*mariadbConfig' pointer.
-    config: &mariadbConfig
-      mysqlDatabase: policyadmin
-    service: &mariadbService policy-mariadb
-    internalPort: 3306
-    nameOverride: *mariadbService
-    # (optional) if localCluster=false and an external secret is used set this variable
-    #userRootSecret: <secretName>
   prometheusEnabled: false
   postgres:
-    useInPolicy: true
     localCluster: true
     # flag to enable the DB creation via pgo-operator
     useOperator: false
@@ -66,20 +48,7 @@ secrets:
   - uid: db-root-password
     name: &dbRootPassSecretName '{{ include "common.release" . }}-policy-db-root-password'
     type: password
-    externalSecret: '{{ .Values.global.mariadbGalera.useInPolicy | ternary
-               ( .Values.global.mariadbGalera.localCluster | ternary
-                 ( hasSuffix "policy-db-root-password" (index .Values "mariadb-galera" "rootUser" "externalSecret") | ternary
-                   ""
-                   (tpl (default "" (index .Values "mariadb-galera" "rootUser" "externalSecret")) .)
-                 )
-                 ( not (empty (default "" .Values.global.mariadbGalera.userRootSecret)) | ternary
-                   .Values.global.mariadbGalera.userRootSecret
-                   (include "common.mariadb.secret.rootPassSecretName"
-                     (dict "dot" . "chartName" .Values.global.mariadbGalera.nameOverride)
-                   )
-                 )
-               )
-               ( .Values.global.postgres.localCluster | ternary
+    externalSecret: '{{ .Values.global.postgres.localCluster | ternary
                  ( hasSuffix "policy-db-root-password" (index .Values "postgres" "config" "pgRootPasswordExternalSecret") | ternary
                    ""
                    (tpl (default "" (index .Values "postgres" "config" "pgRootPasswordExternalSecret")) .)
@@ -90,33 +59,18 @@ secrets:
                      (dict "dot" . "chartName" .Values.global.postgres.nameOverride)
                    )
                  )
-               ) }}'
-    password: '{{ .Values.global.mariadbGalera.useInPolicy | ternary
-                  (index .Values "mariadb-galera" "rootUser" "password")
-                  (index .Values "postgres" "config" "pgRootPassword")
                }}'
+    password: '{{ (index .Values "postgres" "config" "pgRootPassword") }}'
     policy: generate
   - uid: db-secret
     name: &dbSecretName '{{ include "common.release" . }}-policy-db-secret'
     type: basicAuth
-    externalSecret: '{{ .Values.global.mariadbGalera.useInPolicy | ternary
-                        ( hasSuffix "policy-db-secret" (index .Values "mariadb-galera" "db" "externalSecret") | ternary
-                          ""
-                          (tpl (default "" (index .Values "mariadb-galera" "db" "externalSecret")) .)
-                        )
-                        ( hasSuffix "policy-db-secret" (index .Values "postgres" "config" "pgUserExternalSecret") | ternary
-                          ""
-                          (tpl (default "" (index .Values "postgres" "config" "pgUserExternalSecret")) .)
-                        )
+    externalSecret: '{{ hasSuffix "policy-db-secret" (index .Values "postgres" "config" "pgUserExternalSecret") | ternary
+                        ""
+                        (tpl (default "" (index .Values "postgres" "config" "pgUserExternalSecret")) .)
                      }}'
-    login: '{{ .Values.global.mariadbGalera.useInPolicy | ternary
-               (index .Values "mariadb-galera" "db" "user")
-               (index .Values "postgres" "config" "pgUserName")
-            }}'
-    password: '{{ .Values.global.mariadbGalera.useInPolicy | ternary
-                  (index .Values "mariadb-galera" "db" "password")
-                  (index .Values "postgres" "config" "pgUserPassword")
-               }}'
+    login: '{{ (index .Values "postgres" "config" "pgUserName") }}'
+    password: '{{ (index .Values "postgres" "config" "pgUserPassword") }}'
     passwordPolicy: generate
   - uid: policy-app-user-creds
     name: &policyAppCredsSecret '{{ include "common.release" . }}-policy-app-user-creds'
@@ -208,11 +162,8 @@ policy-nexus:
 #################################################################
 
 dbmigrator:
-  # New released image will allow full SASL and Postgres (drools included). Tested with snapshot. Release to come later.
-  image: onap/policy-db-migrator:4.0.1
-  # These schemas will be required with the new version of db-migrator
-  # schemas: "policyadmin clampacm pooling operationshistory"
-  schemas: "policyadmin"
+  image: onap/policy-db-migrator:4.1.0
+  schemas: "policyadmin clampacm pooling operationshistory"
   policy_home: "/opt/app/policy"
 
 subChartsOnly:
@@ -224,9 +175,9 @@ debugEnabled: false
 # default number of instances
 replicaCount: 1
 
-nodeSelector: {}
+nodeSelector: { }
 
-affinity: {}
+affinity: { }
 
 # probe configuration parameters
 liveness:
@@ -240,7 +191,6 @@ readiness:
   initialDelaySeconds: 10
   periodSeconds: 10
 
-
 config:
   policyAppUserName: runtimeUser
   policyPdpPapTopic:
@@ -266,30 +216,6 @@ config:
       groupId: policy-group
   someConfig: blah
 
-mariadb-galera:
-  # mariadb-galera.config and global.mariadbGalera.config must be equals
-  db:
-    user: policy-user
-    # password:
-    externalSecret: *dbSecretName
-    name: &mysqlDbName policyadmin
-  rootUser:
-    externalSecret: *dbRootPassSecretName
-  nameOverride: *mariadbService
-  # mariadb-galera.service and global.mariadbGalera.service must be equals
-  service:
-    name: *mariadbService
-  replicaCount: 1
-  mariadbOperator:
-    galera:
-      enabled: false
-  persistence:
-    enabled: true
-    mountSubPath: policy/maria/data
-    size: 3Gi
-  serviceAccount:
-    nameOverride: *mariadbService
-
 postgresImage: library/postgres:17.2
 # application configuration override for postgres
 postgres:
@@ -317,9 +243,6 @@ readinessCheck:
   wait_for_postgres:
     services:
       - '{{ .Values.global.postgres.service.name2 }}'
-  wait_for_mariadb:
-    services:
-      - '{{ include "common.mariadbService" . }}'
 
 restServer:
   policyPapUserName: policyadmin
@@ -345,7 +268,7 @@ resources:
     requests:
       cpu: "200m"
       memory: "2Gi"
-  unlimited: {}
+  unlimited: { }
 
 securityContext:
   user_id: 100