diff --git a/.github/workflows/release_open_api.yml b/.github/workflows/release_open_api.yml index ea2f1cf1..4c97c46f 100644 --- a/.github/workflows/release_open_api.yml +++ b/.github/workflows/release_open_api.yml @@ -2,7 +2,7 @@ name: Swagger Detect Conflict and Update on: pull_request: branches: - - release-dev + - main types: [ opened, synchronize, reopened ] permissions: @@ -18,4 +18,4 @@ jobs: uses: pagopa/selfcare-commons/github-actions-template/swagger-detect-conflict-spring@main with: path_openapi_docs: app/src/main/resources/swagger/api-docs.json - branch_ref: release-dev \ No newline at end of file + branch_ref: main \ No newline at end of file diff --git a/helm/pnpg/values-dev.yaml b/helm/pnpg/values-dev.yaml index e7336c49..ef920a76 100644 --- a/helm/pnpg/values-dev.yaml +++ b/helm/pnpg/values-dev.yaml @@ -27,4 +27,4 @@ configEnvSpecific: JAVA_TOOL_OPTIONS: "-javaagent:/applicationinsights-agent.jar" APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL: "OFF" EXTERNAL_API_LOG_LEVEL: "DEBUG" - MS_ONBOARDING_URL: "https://selc-d-pnpg-onboarding-ms-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io" + MS_ONBOARDING_URL: "https://selc-d-pnpg-onboarding-ms-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io" diff --git a/helm/pnpg/values-uat.yaml b/helm/pnpg/values-uat.yaml index 92d9c9d4..090f65c0 100644 --- a/helm/pnpg/values-uat.yaml +++ b/helm/pnpg/values-uat.yaml @@ -28,4 +28,4 @@ configEnvSpecific: JAVA_TOOL_OPTIONS: "-javaagent:/applicationinsights-agent.jar" APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL: "OFF" EXTERNAL_API_LOG_LEVEL: "DEBUG" - MS_ONBOARDING_URL: "https://selc-u-pnpg-onboarding-ms-ca.redground-be752d1f.westeurope.azurecontainerapps.io" + MS_ONBOARDING_URL: "https://selc-u-pnpg-onboarding-ms-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io" diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index e1c8588e..54426a42 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -39,4 +39,4 @@ configEnvSpecific: JAVA_TOOL_OPTIONS: "-javaagent:/applicationinsights-agent.jar" APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL: "OFF" EXTERNAL_API_LOG_LEVEL: "DEBUG" - MS_ONBOARDING_URL: "https://selc-u-onboarding-ms-ca.calmsky-143987c1.westeurope.azurecontainerapps.io" + MS_ONBOARDING_URL: "https://selc-u-onboarding-ms-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io" diff --git a/infra/container_apps/env/dev-pnpg/terraform.tfvars b/infra/container_apps/env/dev-pnpg/terraform.tfvars index 1e5557ff..8c860c8e 100644 --- a/infra/container_apps/env/dev-pnpg/terraform.tfvars +++ b/infra/container_apps/env/dev-pnpg/terraform.tfvars @@ -30,8 +30,6 @@ container_app = { memory = "1Gi" } -workload_profile_name = null - app_settings = [ { @@ -64,23 +62,23 @@ app_settings = [ }, { name = "MS_ONBOARDING_URL" - value = "https://selc-d-pnpg-onboarding-ms-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io" + value = "https://selc-d-pnpg-onboarding-ms-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io" }, { name = "MS_CORE_URL" - value = "https://selc-d-pnpg-ms-core-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io" + value = "https://selc-d-pnpg-ms-core-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io" }, { name = "USERVICE_PARTY_REGISTRY_PROXY_URL" - value = "https://selc-d-pnpg-party-reg-proxy-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io" + value = "https://selc-d-pnpg-party-reg-proxy-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io" }, { name = "USERVICE_PARTY_PROCESS_URL" - value = "https://selc-d-pnpg-ms-core-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io" + value = "https://selc-d-pnpg-ms-core-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io" }, { name = "MS_PRODUCT_URL" - value = "https://selc-d-pnpg-product-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io" + value = "https://selc-d-pnpg-product-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io" }, { name = "USERVICE_USER_REGISTRY_URL" @@ -88,7 +86,7 @@ app_settings = [ }, { name = "USERVICE_PARTY_MANAGEMENT_URL" - value = "https://selc-d-pnpg-ms-core-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io" + value = "https://selc-d-pnpg-ms-core-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io" } ] diff --git a/infra/container_apps/env/prod-pnpg/terraform.tfvars b/infra/container_apps/env/prod-pnpg/terraform.tfvars index a4c9b4b8..c3bc3740 100644 --- a/infra/container_apps/env/prod-pnpg/terraform.tfvars +++ b/infra/container_apps/env/prod-pnpg/terraform.tfvars @@ -30,8 +30,6 @@ container_app = { memory = "2.5Gi" } -workload_profile_name = null - app_settings = [ { diff --git a/infra/container_apps/env/uat-pnpg/terraform.tfvars b/infra/container_apps/env/uat-pnpg/terraform.tfvars index f0bf9994..f8fac2bd 100644 --- a/infra/container_apps/env/uat-pnpg/terraform.tfvars +++ b/infra/container_apps/env/uat-pnpg/terraform.tfvars @@ -17,8 +17,6 @@ container_app = { memory = "1Gi" } -workload_profile_name = null - app_settings = [ { @@ -51,19 +49,19 @@ app_settings = [ }, { name = "MS_ONBOARDING_URL" - value = "https://selc-u-pnpg-onboarding-ms-ca.redground-be752d1f.westeurope.azurecontainerapps.io" + value = "https://selc-u-pnpg-onboarding-ms-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io" }, { name = "MS_CORE_URL" - value = "https://selc-u-pnpg-ms-core-ca.redground-be752d1f.westeurope.azurecontainerapps.io" + value = "https://selc-u-pnpg-ms-core-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io" }, { name = "USERVICE_PARTY_REGISTRY_PROXY_URL" - value = "https://selc-u-pnpg-party-reg-proxy-ca.redground-be752d1f.westeurope.azurecontainerapps.io" + value = "https://selc-u-pnpg-party-reg-proxy-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io" }, { name = "USERVICE_PARTY_PROCESS_URL" - value = "https://selc-u-pnpg-ms-core-ca.redground-be752d1f.westeurope.azurecontainerapps.io" + value = "https://selc-u-pnpg-ms-core-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io" }, { name = "MS_PRODUCT_URL" @@ -75,7 +73,7 @@ app_settings = [ }, { name = "USERVICE_PARTY_MANAGEMENT_URL" - value = "https://selc-u-pnpg-ms-core-ca.redground-be752d1f.westeurope.azurecontainerapps.io" + value = "https://selc-u-pnpg-ms-core-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io" } ] diff --git a/infra/container_apps/env/uat/terraform.tfvars b/infra/container_apps/env/uat/terraform.tfvars index acafe398..79228105 100644 --- a/infra/container_apps/env/uat/terraform.tfvars +++ b/infra/container_apps/env/uat/terraform.tfvars @@ -49,19 +49,19 @@ app_settings = [ }, { name = "MS_ONBOARDING_URL" - value = "https://selc-u-onboarding-ms-ca.calmsky-143987c1.westeurope.azurecontainerapps.io" + value = "https://selc-u-onboarding-ms-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io" }, { name = "MS_CORE_URL" - value = "https://selc-u-ms-core-ca.calmsky-143987c1.westeurope.azurecontainerapps.io" + value = "https://selc-u-ms-core-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io" }, { name = "USERVICE_PARTY_REGISTRY_PROXY_URL" - value = "https://selc-u-party-reg-proxy-ca.calmsky-143987c1.westeurope.azurecontainerapps.io" + value = "https://selc-u-party-reg-proxy-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io" }, { name = "USERVICE_PARTY_PROCESS_URL" - value = "https://selc-u-ms-core-ca.calmsky-143987c1.westeurope.azurecontainerapps.io" + value = "https://selc-u-ms-core-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io" }, { name = "MS_PRODUCT_URL" @@ -73,7 +73,7 @@ app_settings = [ }, { name = "USERVICE_PARTY_MANAGEMENT_URL" - value = "https://selc-u-ms-core-ca.calmsky-143987c1.westeurope.azurecontainerapps.io" + value = "https://selc-u-ms-core-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io" }, { name = "STORAGE_CONTAINER" diff --git a/infra/container_apps/main.tf b/infra/container_apps/main.tf index 7adbcba4..25ddbd49 100644 --- a/infra/container_apps/main.tf +++ b/infra/container_apps/main.tf @@ -20,7 +20,6 @@ module "container_app_ext_api_backend" { image_tag = var.image_tag app_settings = var.app_settings secrets_names = var.secrets_names - workload_profile_name = var.workload_profile_name tags = var.tags } \ No newline at end of file diff --git a/infra/container_apps/variables.tf b/infra/container_apps/variables.tf index 9960e93a..a517b090 100644 --- a/infra/container_apps/variables.tf +++ b/infra/container_apps/variables.tf @@ -54,10 +54,4 @@ variable "app_settings" { variable "secrets_names" { type = map(string) description = "KeyVault secrets to get values from" -} - -variable "workload_profile_name" { - type = string - description = "Workload Profile name to use" - default = "Consumption" } \ No newline at end of file