Skip to content

Commit

Permalink
chore: Workload profiles migration PNPG (#285)
Browse files Browse the repository at this point in the history
  • Loading branch information
manuraf authored Apr 2, 2024
1 parent f4cd9be commit e5430ee
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 36 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release_open_api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Swagger Detect Conflict and Update
on:
pull_request:
branches:
- release-dev
- main
types: [ opened, synchronize, reopened ]

permissions:
Expand All @@ -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
branch_ref: main
2 changes: 1 addition & 1 deletion helm/pnpg/values-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ configEnvSpecific:
APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL: "OFF"
B4F_ONBOARDING_LOG_LEVEL: "DEBUG"
REST_CLIENT_LOGGER_LEVEL: "FULL"
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"
2 changes: 1 addition & 1 deletion helm/pnpg/values-uat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ configEnvSpecific:
APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL: "OFF"
B4F_ONBOARDING_LOG_LEVEL: "DEBUG"
REST_CLIENT_LOGGER_LEVEL: "FULL"
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"
2 changes: 1 addition & 1 deletion helm/values-uat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ configEnvSpecific:
APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL: "OFF"
B4F_ONBOARDING_LOG_LEVEL: "DEBUG"
REST_CLIENT_LOGGER_LEVEL: "FULL"
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"
ONBOARDING_ALLOWED_INSTITUTIONS_PRODUCTS: "{'prod-interop':{'*'},'prod-pn':{'*'},'prod-io':{'*'},'prod-io-premium':{'*'},'prod-pagopa':{'*'},'prod-pn-coll':{'*'},'prod-fd':{'*'},'prod-fd-garantito':{'*'},'prod-io-sign':{'*'},'prod-pn-dev':{'*'},'prod-sendino':{'*'}}"
16 changes: 7 additions & 9 deletions infra/container_apps/env/dev-pnpg/terraform.tfvars
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
is_pnpg = true
env_short = "d"
private_dns_name = "selc-d-pnpg-onboardingbackend-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io"
private_dns_name = "selc-d-pnpg-onboardingbackend-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io"
dns_zone_prefix = "pnpg.dev.selfcare"
api_dns_zone_prefix = "api-pnpg.dev.selfcare"

Expand Down Expand Up @@ -33,8 +33,6 @@ container_app = {
memory = "1Gi"
}

workload_profile_name = null

app_settings = [
{
name = "APPLICATIONINSIGHTS_ROLE_NAME"
Expand All @@ -58,31 +56,31 @@ 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 = "ONBOARDING_ALLOWED_INSTITUTIONS_PRODUCTS"
value = "{'prod-pn-pg':{'*'}}"
},
{
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 = "MS_EXTERNAL_INTERCEPTOR_URL"
value = "https://selc-d-pnpg-ext-interceptor-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io"
value = "https://selc-d-pnpg-ext-interceptor-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 = "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 = "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"
Expand Down
2 changes: 0 additions & 2 deletions infra/container_apps/env/prod-pnpg/terraform.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ container_app = {
memory = "2.5Gi"
}

workload_profile_name = null

app_settings = [
{
name = "APPLICATIONINSIGHTS_ROLE_NAME"
Expand Down
14 changes: 6 additions & 8 deletions infra/container_apps/env/uat-pnpg/terraform.tfvars
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
is_pnpg = true
env_short = "u"
private_dns_name = "selc-u-pnpg-onboardingbackend-ca.redground-be752d1f.westeurope.azurecontainerapps.io"
private_dns_name = "selc-u-pnpg-onboardingbackend-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io"
dns_zone_prefix = "imprese.uat.notifichedigitali"
api_dns_zone_prefix = "api-pnpg.uat.selfcare"
external_domain = "it"
Expand All @@ -21,8 +21,6 @@ container_app = {
memory = "1Gi"
}

workload_profile_name = null

app_settings = [
{
name = "APPLICATIONINSIGHTS_ROLE_NAME"
Expand All @@ -46,27 +44,27 @@ 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 = "ONBOARDING_ALLOWED_INSTITUTIONS_PRODUCTS"
value = "{'prod-pn-pg':{'*'}}"
},
{
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 = "MS_EXTERNAL_INTERCEPTOR_URL"
value = "https://selc-u-pnpg-ext-interceptor-ca.redground-be752d1f.westeurope.azurecontainerapps.io"
value = "https://selc-u-pnpg-ext-interceptor-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 = "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 = "MS_PRODUCT_URL"
Expand Down
10 changes: 5 additions & 5 deletions infra/container_apps/env/uat/terraform.tfvars
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
env_short = "u"
private_dns_name = "selc-u-onboardingbackend-ca.calmsky-143987c1.westeurope.azurecontainerapps.io"
private_dns_name = "selc-u-onboardingbackend-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io"
dns_zone_prefix = "uat.selfcare"
api_dns_zone_prefix = "api.uat.selfcare"

Expand Down Expand Up @@ -42,27 +42,27 @@ 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 = "ONBOARDING_ALLOWED_INSTITUTIONS_PRODUCTS"
value = "{'prod-interop':{'*'},'prod-pn':{'*'},'prod-io':{'*'},'prod-io-premium':{'*'},'prod-pagopa':{'*'},'prod-fd':{'*'},'prod-fd-garantito':{'*'},'prod-io-sign':{'*'},'prod-sendino':{'*'}}"
},
{
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 = "MS_EXTERNAL_INTERCEPTOR_URL"
value = "http://selc.internal.uat.selfcare.pagopa.it/ms-external-interceptor/v1"
},
{
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 = "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 = "MS_PRODUCT_URL"
Expand Down
1 change: 0 additions & 1 deletion infra/container_apps/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ module "container_app_onboarding_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
}
6 changes: 0 additions & 6 deletions infra/container_apps/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,3 @@ variable "api_dns_zone_prefix" {
default = "api.selfcare"
description = "The dns subdomain."
}

variable "workload_profile_name" {
type = string
description = "Workload Profile name to use"
default = "Consumption"
}

0 comments on commit e5430ee

Please sign in to comment.