diff options
author | 2025-02-13 20:20:45 +0000 | |
---|---|---|
committer | 2025-02-14 13:23:33 +0000 | |
commit | c6ddebbd61e755f078d97483a4efec6189e4d756 (patch) | |
tree | ac561a300438af30e9cb01c02bd29bbba36aba96 /kubernetes/policy/components/policy-api | |
parent | d2b2fd0afd97799ae0340420afae3279cd680bb0 (diff) |
[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>
Diffstat (limited to 'kubernetes/policy/components/policy-api')
-rw-r--r--[-rwxr-xr-x] | kubernetes/policy/components/policy-api/Chart.yaml | 4 | ||||
-rw-r--r-- | kubernetes/policy/components/policy-api/resources/config/apiParameters.yaml | 26 | ||||
-rwxr-xr-x | kubernetes/policy/components/policy-api/templates/deployment.yaml | 6 | ||||
-rw-r--r--[-rwxr-xr-x] | kubernetes/policy/components/policy-api/values.yaml | 10 |
4 files changed, 6 insertions, 40 deletions
diff --git a/kubernetes/policy/components/policy-api/Chart.yaml b/kubernetes/policy/components/policy-api/Chart.yaml index 6c3351a5df..859c343900 100755..100644 --- 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 3e357a66e7..fac24347a2 100644 --- 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 f89945f90e..063bc80445 100755 --- 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 index 3e86ed1894..7e3aa51318 100755..100644 --- 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: |