Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
aomegax committed Mar 26, 2024
1 parent ee07290 commit fc340b4
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 14 deletions.
2 changes: 1 addition & 1 deletion helm/values-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ microservice-chart:
CORS_CONFIGURATION: '{"origins": ["*"], "methods": ["*"]}'
DB_NEXI_POSTGRES_URL: "jdbc:postgresql://db-postgres-ndp.d.db-nodo-pagamenti.com:5444/ndpspct?prepareThreshold=0&currentSchema=NODO4_CFG"
DB_NEXI_POSTGRES_USER: "pp_nodo4_cfg"
DB_NEXI_POSTGRES_ENABLED: "true"
DB_NEXI_POSTGRES_ENABLED: "false"
DB_NEXI_POSTGRES_SERVICE_IDENTIFIER: "NDP004DEV"
DB_NEXI_ORACLE_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))"
DB_NEXI_ORACLE_USER: "NODO4_CFG"
Expand Down
31 changes: 24 additions & 7 deletions helm/values-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ microservice-chart:
memory: "512Mi"
cpu: "0.25"
limits:
memory: "512Mi"
cpu: "0.5"
memory: "1G"
cpu: "1.0"
autoscaling:
enable: true
minReplica: 1
Expand All @@ -67,9 +67,20 @@ microservice-chart:
APP_LOGGING_LEVEL: 'DEBUG'
DEFAULT_LOGGING_LEVEL: 'INFO'
CORS_CONFIGURATION: '{"origins": ["*"], "methods": ["*"]}'
CACHET_TX_NAME: "nodo-dei-pagamenti-cache"
API_CONFIG_CACHE_URL: "https://api.platform.pagopa.it/api-config-cache/o/v1/stakeholders/node/cache/schemas/v1"
STAND_IN_MANAGER_URL: "https://api.platform.pagopa.it/stand-in-manager/api/v1"
DB_NEXI_POSTGRES_URL: "jdbc:postgresql://db-postgres-ndp.p.db-nodo-pagamenti.com:5444/ndpspcp?prepareThreshold=0&currentSchema=NODO4_CFG"
DB_NEXI_POSTGRES_USER: "pp_nodo4_cfg"
DB_NEXI_POSTGRES_ENABLED: "false"
DB_NEXI_POSTGRES_SERVICE_IDENTIFIER: "NDP004DEV"
DB_CONFIG_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))"
DB_NEXI_ORACLE_USER: "NODO4_CFG"
DB_NEXI_ORACLE_ENABLED: "true"
DB_NEXI_ORACLE_SERVICE_IDENTIFIER: "NDP003DEV"
DB_PAGOPA_POSTGRES_URL: "jdbc:postgresql://ndp.p.db-nodo-pagamenti.com:6432/nodo?sslmode=require&prepareThreshold=0&currentSchema=cfg"
DB_PAGOPA_POSTGRES_USER: "cfg"
DB_PAGOPA_POSTGRES_ENABLED: "true"
DB_PAGOPA_POSTGRES_SERVICE_IDENTIFIER: "NDP001DEV"
API_CONFIG_CACHE_URL: "https://api.uat.platform.pagopa.it/api-config-cache/o/v1/stakeholders/node/cache/schemas/v1"
STAND_IN_MANAGER_URL: "https://api.uat.platform.pagopa.it/stand-in-manager/api/v1"
OTEL_SERVICE_NAME: "pagopanodecfgsync"
OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=prod"
OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
Expand All @@ -80,10 +91,16 @@ microservice-chart:
envSecret:
# required
APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-p-connection-string'
CACHE_TX_CONNECTION_STRING: "nodo-dei-pagamenti-cache-tx-connection-string-key"
OTEL_EXPORTER_OTLP_HEADERS: elastic-apm-secret-token
DB_PAGOPA_POSTGRES_PASSWORD: "db-cfg-password"
DB_NEXI_POSTGRES_PASSWORD: "db-nexi-cfg-password"
DB_NEXI_ORACLE_PASSWORD: "oracle-db-cfg-password"
API_CONFIG_CACHE_RX_CONNECTION_STRING: "nodo-dei-pagamenti-cache-sync-rx-connection-string-key"
API_CONFIG_CACHE_SA_CONNECTION_STRING: "nodo-dei-pagamenti-cache-sync-sa-connection-string-key"
STAND_IN_MANAGER_RX_CONNECTION_STRING: "nodo-dei-pagamenti-stand-in-sync-rx-connection-string-key"
STAND_IN_MANAGER_SA_CONNECTION_STRING: "nodo-dei-pagamenti-stand-in-sync-sa-connection-string-key"
API_CONFIG_CACHE_SUBSCRIPTION_KEY: "cfg-for-node-subscription-key"
STAND_IN_MANAGER_SUBSCRIPTION_KEY: "cfg-for-node-subscription-key"
OTEL_EXPORTER_OTLP_HEADERS: "elastic-apm-secret-token"
keyvault:
name: "pagopa-p-nodo-kv"
tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
Expand Down
29 changes: 23 additions & 6 deletions helm/values-uat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ microservice-chart:
memory: "512Mi"
cpu: "0.25"
limits:
memory: "512Mi"
cpu: "0.5"
memory: "1G"
cpu: "1.0"
autoscaling:
enable: true
minReplica: 1
Expand All @@ -62,12 +62,23 @@ microservice-chart:
type: Utilization # Allowed types are 'Utilization' or 'AverageValue'
value: "75"
envConfig:
WEBSITE_SITE_NAME: 'pagopa-node-cfg-sync' # required to show cloud role name in application insights
WEBSITE_SITE_NAME: 'pagopa-node-cfg-sync'
ENV: 'azure-uat'
APP_LOGGING_LEVEL: 'DEBUG'
DEFAULT_LOGGING_LEVEL: 'INFO'
CORS_CONFIGURATION: '{"origins": ["*"], "methods": ["*"]}'
CACHET_TX_NAME: "nodo-dei-pagamenti-cache"
DB_NEXI_POSTGRES_URL: "jdbc:postgresql://db-postgres-ndp.u.db-nodo-pagamenti.com:5444/ndpspca?prepareThreshold=0&currentSchema=NODO4_CFG"
DB_NEXI_POSTGRES_USER: "pp_nodo4_cfg"
DB_NEXI_POSTGRES_ENABLED: "false"
DB_NEXI_POSTGRES_SERVICE_IDENTIFIER: "NDP004DEV"
DB_CONFIG_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))"
DB_NEXI_ORACLE_USER: "NODO4_CFG"
DB_NEXI_ORACLE_ENABLED: "true"
DB_NEXI_ORACLE_SERVICE_IDENTIFIER: "NDP003DEV"
DB_PAGOPA_POSTGRES_URL: "jdbc:postgresql://ndp.u.db-nodo-pagamenti.com:6432/nodo?sslmode=require&prepareThreshold=0&currentSchema=cfg"
DB_PAGOPA_POSTGRES_USER: "cfg"
DB_PAGOPA_POSTGRES_ENABLED: "true"
DB_PAGOPA_POSTGRES_SERVICE_IDENTIFIER: "NDP001DEV"
API_CONFIG_CACHE_URL: "https://api.uat.platform.pagopa.it/api-config-cache/o/v1/stakeholders/node/cache/schemas/v1"
STAND_IN_MANAGER_URL: "https://api.uat.platform.pagopa.it/stand-in-manager/api/v1"
OTEL_SERVICE_NAME: "pagopanodecfgsync"
Expand All @@ -80,10 +91,16 @@ microservice-chart:
envSecret:
# required
APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-u-connection-string'
CACHE_TX_CONNECTION_STRING: "nodo-dei-pagamenti-cache-tx-connection-string-key"
OTEL_EXPORTER_OTLP_HEADERS: elastic-apm-secret-token
DB_PAGOPA_POSTGRES_PASSWORD: "db-cfg-password"
DB_NEXI_POSTGRES_PASSWORD: "db-nexi-cfg-password"
DB_NEXI_ORACLE_PASSWORD: "oracle-db-cfg-password"
API_CONFIG_CACHE_RX_CONNECTION_STRING: "nodo-dei-pagamenti-cache-sync-rx-connection-string-key"
API_CONFIG_CACHE_SA_CONNECTION_STRING: "nodo-dei-pagamenti-cache-sync-sa-connection-string-key"
STAND_IN_MANAGER_RX_CONNECTION_STRING: "nodo-dei-pagamenti-stand-in-sync-rx-connection-string-key"
STAND_IN_MANAGER_SA_CONNECTION_STRING: "nodo-dei-pagamenti-stand-in-sync-sa-connection-string-key"
API_CONFIG_CACHE_SUBSCRIPTION_KEY: "cfg-for-node-subscription-key"
STAND_IN_MANAGER_SUBSCRIPTION_KEY: "cfg-for-node-subscription-key"
OTEL_EXPORTER_OTLP_HEADERS: "elastic-apm-secret-token"
keyvault:
name: "pagopa-u-nodo-kv"
tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
Expand Down

0 comments on commit fc340b4

Please sign in to comment.