fix: Helm configuration

.github/workflows/code_review.yml

@@ -35,7 +35,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - name: Code Review
-        uses: pagopa/github-actions-template/maven-code-review@5a544cfcc87edacde3391e4fb70228194f90ec63 # v1.10.4
+        uses: pagopa/github-actions-template/maven-code-review@525266fb788f4da438e5919fcf660fe8637271ed # 2.2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           sonar_token: ${{ secrets.SONAR_TOKEN }}

helm/Chart.yaml

@@ -10,8 +10,8 @@ dependencies:
     repository: "https://pagopa.github.io/aks-microservice-chart-blueprint"
     alias: postgresql
     condition: postgresql.enabled
-  - name: microservice-chart
-    version: 2.8.0
-    repository: "https://pagopa.github.io/aks-microservice-chart-blueprint"
-    alias: oracle
-    condition: oracle.enabled
+  # - name: microservice-chart
+  #   version: 2.8.0
+  #   repository: "https://pagopa.github.io/aks-microservice-chart-blueprint"
+  #   alias: oracle
+  #   condition: oracle.enabled

helm/values-dev.yaml

@@ -97,12 +97,12 @@ microservice-chart: &microservice-chart
           type: Utilization # Allowed types are 'Utilization' or 'AverageValue'
           value: "75"
   envConfig: &envConfig
-    ENV: 'azure-dev'
+    ENV: 'dev'
     CORS_CONFIGURATION: '{"origins": ["*"], "methods": ["*"]}'
-    APP_LOGGING_LEVEL: 'DEBUG'
+    APP_LOGGING_LEVEL: 'INFO'
     DEFAULT_LOGGING_LEVEL: 'INFO'
     OTEL_SERVICE_NAME: "pagopa-api-config-selfcare-integration"
-    OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=azure-dev"
+    OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=dev"
     OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
     OTEL_LOGS_EXPORTER: none
     OTEL_TRACES_SAMPLER: "always_on"
@@ -140,7 +140,7 @@ postgresql:
     !!merge <<: *envConfig
     WEBSITE_SITE_NAME: 'pagopaapiconfigselfcareintegration' # required to show cloud role name in application insights
     APPLICATIONINSIGHTS_ROLE_NAME: "pagopa-api-config-selfcare-integration"
-    SPRING_DATASOURCE_URL: "jdbc:postgresql://nodo-db.d.internal.postgresql.pagopa.it:6432/nodo?sslmode=require&prepareThreshold=0&currentSchema=cfg"
+    SPRING_DATASOURCE_URL: "jdbc:postgresql://nodo-db.d.internal.postgresql.pagopa.it:5432/nodo?sslmode=require&prepareThreshold=0&currentSchema=cfg"
     SPRING_DATASOURCE_USERNAME: 'cfg'
     SPRING_DATASOURCE_DRIVER: 'org.postgresql.Driver'
     SPRING_JPA_DB_PLATFORM: 'org.hibernate.dialect.PostgreSQLDialect'
@@ -150,20 +150,21 @@ postgresql:
     !!merge <<: *envSecret
     SPRING_DATASOURCE_PASSWORD: 'postgresql-db-cfg-password'
 # Configuration for Oracle
-oracle:
-  !!merge <<: *microservice-chart
-  ingress:
-    !!merge <<: *ingress
-    path: /pagopa-api-config-selfcare-integration/o/(.*)
-  envConfig:
-    !!merge <<: *envConfig
-    WEBSITE_SITE_NAME: 'pagopaapiconfigselfcareintegration' # required to show cloud role name in application insights
-    APPLICATIONINSIGHTS_ROLE_NAME: "pagopa-api-config-selfcare-integration"
-    SPRING_DATASOURCE_URL: "jdbc:oracle:thin:@(DESCRIPTION=(ENABLE=BROKEN)(ADDRESS=(PROTOCOL=tcp)(PORT=1522)(HOST=db-nodo-pagamenti.d.db-nodo-pagamenti.com))(CONNECT_DATA=(SERVICE_NAME=NDPSPCT_PP_NODO4_CFG))(SO_KEEPALIVE=true)(TCP_KEEPIDLE=60)(TCP_KEEPINTVL=30)(TCP_KEEPCNT=15))"
-    SPRING_DATASOURCE_USERNAME: 'NODO4_CFG'
-    SPRING_DATASOURCE_DRIVER: 'oracle.jdbc.OracleDriver'
-    SPRING_JPA_DB_PLATFORM: 'org.hibernate.dialect.Oracle12cDialect'
-    DATABASE_SCHEMA: 'NODO4_CFG'
-  envSecret:
-    !!merge <<: *envSecret
-    SPRING_DATASOURCE_PASSWORD: 'oracle-db-cfg-password'
+# oracle:
+#   enabled: false
+#  !!merge <<: *microservice-chart
+#  ingress:
+#    !!merge <<: *ingress
+#    path: /pagopa-api-config-selfcare-integration/o/(.*)
+#  envConfig:
+#    !!merge <<: *envConfig
+#    WEBSITE_SITE_NAME: 'pagopaapiconfigselfcareintegration' # required to show cloud role name in application insights
+#    APPLICATIONINSIGHTS_ROLE_NAME: "pagopa-api-config-selfcare-integration"
+#    SPRING_DATASOURCE_URL: "jdbc:oracle:thin:@(DESCRIPTION=(ENABLE=BROKEN)(ADDRESS=(PROTOCOL=tcp)(PORT=1522)(HOST=db-nodo-pagamenti.d.db-nodo-pagamenti.com))(CONNECT_DATA=(SERVICE_NAME=NDPSPCT_PP_NODO4_CFG))(SO_KEEPALIVE=true)(TCP_KEEPIDLE=60)(TCP_KEEPINTVL=30)(TCP_KEEPCNT=15))"
+#    SPRING_DATASOURCE_USERNAME: 'NODO4_CFG'
+#    SPRING_DATASOURCE_DRIVER: 'oracle.jdbc.OracleDriver'
+#    SPRING_JPA_DB_PLATFORM: 'org.hibernate.dialect.Oracle12cDialect'
+#    DATABASE_SCHEMA: 'NODO4_CFG'
+#  envSecret:
+#    !!merge <<: *envSecret
+#    SPRING_DATASOURCE_PASSWORD: 'oracle-db-cfg-password'

helm/values-prod.yaml

@@ -97,12 +97,12 @@ microservice-chart: &microservice-chart
           type: Utilization # Allowed types are 'Utilization' or 'AverageValue'
           value: "75"
   envConfig: &envConfig
-    ENV: 'azure-prod'
+    ENV: 'prod'
     CORS_CONFIGURATION: '{"origins": ["*"], "methods": ["*"]}'
-    APP_LOGGING_LEVEL: 'DEBUG'
+    APP_LOGGING_LEVEL: 'INFO'
     DEFAULT_LOGGING_LEVEL: 'INFO'
     OTEL_SERVICE_NAME: "pagopa-api-config-selfcare-integration"
-    OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=azure-prod"
+    OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=prod"
     OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
     OTEL_LOGS_EXPORTER: none
     OTEL_TRACES_SAMPLER: "always_on"
@@ -149,7 +149,7 @@ postgresql:
     !!merge <<: *envConfig
     WEBSITE_SITE_NAME: 'pagopaapiconfigselfcareintegration' # required to show cloud role name in application insights
     APPLICATIONINSIGHTS_ROLE_NAME: "pagopa-api-config-selfcare-integration"
-    SPRING_DATASOURCE_URL: "jdbc:postgresql://nodo-db.p.internal.postgresql.pagopa.it:6432/nodo?sslmode=require&prepareThreshold=0&currentSchema=cfg"
+    SPRING_DATASOURCE_URL: "jdbc:postgresql://nodo-db.p.internal.postgresql.pagopa.it:5432/nodo?sslmode=require&prepareThreshold=0&currentSchema=cfg"
     SPRING_DATASOURCE_USERNAME: 'cfg'
     SPRING_DATASOURCE_DRIVER: 'org.postgresql.Driver'
     SPRING_JPA_DB_PLATFORM: 'org.hibernate.dialect.PostgreSQLDialect'
@@ -159,20 +159,21 @@ postgresql:
     !!merge <<: *envSecret
     SPRING_DATASOURCE_PASSWORD: 'postgresql-db-cfg-password'
 # Configuration for Oracle
-oracle:
-  !!merge <<: *microservice-chart
-  ingress:
-    !!merge <<: *ingress
-    path: /pagopa-api-config-selfcare-integration/o/(.*)
-  envConfig:
-    !!merge <<: *envConfig
-    WEBSITE_SITE_NAME: 'pagopaapiconfigselfcareintegration' # required to show cloud role name in application insights
-    APPLICATIONINSIGHTS_ROLE_NAME: "pagopa-api-config-selfcare-integration"
-    SPRING_DATASOURCE_URL: "jdbc:oracle:thin:@(DESCRIPTION=(ENABLE=BROKEN)(ADDRESS=(PROTOCOL=tcp)(PORT=1521)(HOST=db-nodo-pagamenti.p.db-nodo-pagamenti.com))(CONNECT_DATA=(SERVICE_NAME=NDPSPCP_NODO4_CFG))(SO_KEEPALIVE=true)(TCP_KEEPIDLE=60)(TCP_KEEPINTVL=30)(TCP_KEEPCNT=15))"
-    SPRING_DATASOURCE_USERNAME: 'NODO4_CFG'
-    SPRING_DATASOURCE_DRIVER: 'oracle.jdbc.OracleDriver'
-    SPRING_JPA_DB_PLATFORM: 'org.hibernate.dialect.Oracle12cDialect'
-    DATABASE_SCHEMA: 'NODO4_CFG'
-  envSecret:
-    !!merge <<: *envSecret
-    SPRING_DATASOURCE_PASSWORD: 'oracle-db-cfg-password'
+# oracle:
+#   enabled: false
+#  !!merge <<: *microservice-chart
+#  ingress:
+#    !!merge <<: *ingress
+#    path: /pagopa-api-config-selfcare-integration/o/(.*)
+#  envConfig:
+#    !!merge <<: *envConfig
+#    WEBSITE_SITE_NAME: 'pagopaapiconfigselfcareintegration' # required to show cloud role name in application insights
+#    APPLICATIONINSIGHTS_ROLE_NAME: "pagopa-api-config-selfcare-integration"
+#    SPRING_DATASOURCE_URL: "jdbc:oracle:thin:@(DESCRIPTION=(ENABLE=BROKEN)(ADDRESS=(PROTOCOL=tcp)(PORT=1521)(HOST=db-nodo-pagamenti.p.db-nodo-pagamenti.com))(CONNECT_DATA=(SERVICE_NAME=NDPSPCP_NODO4_CFG))(SO_KEEPALIVE=true)(TCP_KEEPIDLE=60)(TCP_KEEPINTVL=30)(TCP_KEEPCNT=15))"
+#    SPRING_DATASOURCE_USERNAME: 'NODO4_CFG'
+#    SPRING_DATASOURCE_DRIVER: 'oracle.jdbc.OracleDriver'
+#    SPRING_JPA_DB_PLATFORM: 'org.hibernate.dialect.Oracle12cDialect'
+#    DATABASE_SCHEMA: 'NODO4_CFG'
+#  envSecret:
+#    !!merge <<: *envSecret
+#    SPRING_DATASOURCE_PASSWORD: 'oracle-db-cfg-password'

helm/values-uat.yaml

@@ -97,12 +97,12 @@ microservice-chart: &microservice-chart
           type: Utilization # Allowed types are 'Utilization' or 'AverageValue'
           value: "75"
   envConfig: &envConfig
-    ENV: 'azure-uat'
+    ENV: 'uat'
     CORS_CONFIGURATION: '{"origins": ["*"], "methods": ["*"]}'
-    APP_LOGGING_LEVEL: 'DEBUG'
+    APP_LOGGING_LEVEL: 'INFO'
     DEFAULT_LOGGING_LEVEL: 'INFO'
     OTEL_SERVICE_NAME: "pagopa-api-config-selfcare-integration"
-    OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=azure-uat"
+    OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=uat"
     OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
     OTEL_LOGS_EXPORTER: none
     OTEL_TRACES_SAMPLER: "always_on"
@@ -140,7 +140,7 @@ postgresql:
     !!merge <<: *envConfig
     WEBSITE_SITE_NAME: 'pagopaapiconfigselfcareintegration' # required to show cloud role name in application insights
     APPLICATIONINSIGHTS_ROLE_NAME: "pagopa-api-config-selfcare-integration"
-    SPRING_DATASOURCE_URL: "jdbc:postgresql://nodo-db.u.internal.postgresql.pagopa.it:6432/nodo?sslmode=require&prepareThreshold=0&currentSchema=cfg"
+    SPRING_DATASOURCE_URL: "jdbc:postgresql://nodo-db.u.internal.postgresql.pagopa.it:5432/nodo?sslmode=require&prepareThreshold=0&currentSchema=cfg"
     SPRING_DATASOURCE_USERNAME: 'cfg'
     SPRING_DATASOURCE_DRIVER: 'org.postgresql.Driver'
     SPRING_JPA_DB_PLATFORM: 'org.hibernate.dialect.PostgreSQLDialect'
@@ -150,20 +150,21 @@ postgresql:
     !!merge <<: *envSecret
     SPRING_DATASOURCE_PASSWORD: 'postgresql-db-cfg-password'
 # Configuration for Oracle
-oracle:
-  !!merge <<: *microservice-chart
-  ingress:
-    !!merge <<: *ingress
-    path: /pagopa-api-config-selfcare-integration/o/(.*)
-  envConfig:
-    !!merge <<: *envConfig
-    WEBSITE_SITE_NAME: 'pagopaapiconfigselfcareintegration' # required to show cloud role name in application insights
-    APPLICATIONINSIGHTS_ROLE_NAME: "pagopa-api-config-selfcare-integration"
-    SPRING_DATASOURCE_URL: "jdbc:oracle:thin:@(DESCRIPTION=(ENABLE=BROKEN)(ADDRESS=(PROTOCOL=tcp)(PORT=1524)(HOST=db-nodo-pagamenti.u.db-nodo-pagamenti.com))(CONNECT_DATA=(SERVICE_NAME=NDPSPCA_NODO4_CFG))(SO_KEEPALIVE=true)(TCP_KEEPIDLE=60)(TCP_KEEPINTVL=30)(TCP_KEEPCNT=15))"
-    SPRING_DATASOURCE_USERNAME: 'PP_NODO4_CFG'
-    SPRING_DATASOURCE_DRIVER: 'oracle.jdbc.OracleDriver'
-    SPRING_JPA_DB_PLATFORM: 'org.hibernate.dialect.Oracle12cDialect'
-    DATABASE_SCHEMA: 'NODO4_CFG'
-  envSecret:
-    !!merge <<: *envSecret
-    SPRING_DATASOURCE_PASSWORD: 'oracle-db-cfg-password'
+# oracle:
+#   enabled: false
+#  !!merge <<: *microservice-chart
+#  ingress:
+#    !!merge <<: *ingress
+#    path: /pagopa-api-config-selfcare-integration/o/(.*)
+#  envConfig:
+#    !!merge <<: *envConfig
+#    WEBSITE_SITE_NAME: 'pagopaapiconfigselfcareintegration' # required to show cloud role name in application insights
+#    APPLICATIONINSIGHTS_ROLE_NAME: "pagopa-api-config-selfcare-integration"
+#    SPRING_DATASOURCE_URL: "jdbc:oracle:thin:@(DESCRIPTION=(ENABLE=BROKEN)(ADDRESS=(PROTOCOL=tcp)(PORT=1524)(HOST=db-nodo-pagamenti.u.db-nodo-pagamenti.com))(CONNECT_DATA=(SERVICE_NAME=NDPSPCA_NODO4_CFG))(SO_KEEPALIVE=true)(TCP_KEEPIDLE=60)(TCP_KEEPINTVL=30)(TCP_KEEPCNT=15))"
+#    SPRING_DATASOURCE_USERNAME: 'PP_NODO4_CFG'
+#    SPRING_DATASOURCE_DRIVER: 'oracle.jdbc.OracleDriver'
+#    SPRING_JPA_DB_PLATFORM: 'org.hibernate.dialect.Oracle12cDialect'
+#    DATABASE_SCHEMA: 'NODO4_CFG'
+#  envSecret:
+#    !!merge <<: *envSecret
+#    SPRING_DATASOURCE_PASSWORD: 'oracle-db-cfg-password'