From 5056f8b99458e5d06a3ddfe0bc5cb7fab0dd1387 Mon Sep 17 00:00:00 2001 From: Manuel Rafeli Date: Tue, 2 Apr 2024 17:07:08 +0200 Subject: [PATCH] chore: Workload profiles migration PNPG (#460) * remove workload_profile_name var * change dev dns * fix var.image_tag * uat dns suffix --- infra/container_apps/env/dev-pnpg/terraform.tfvars | 8 +++----- infra/container_apps/env/prod-pnpg/terraform.tfvars | 2 -- infra/container_apps/env/uat-pnpg/terraform.tfvars | 6 ++---- infra/container_apps/env/uat/terraform.tfvars | 4 ++-- infra/container_apps/main.tf | 3 +-- infra/container_apps/variables.tf | 6 ------ 6 files changed, 8 insertions(+), 21 deletions(-) diff --git a/infra/container_apps/env/dev-pnpg/terraform.tfvars b/infra/container_apps/env/dev-pnpg/terraform.tfvars index 245bfadec..aa5ea9f6b 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 = [ { name = "DESTINATION_MAILS" @@ -170,15 +168,15 @@ app_settings = [ }, { name = "MS_NOTIFICATION_MANAGER_URL" - value = "https://selc-d-pnpg-notification-mngr-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io" + value = "https://selc-d-pnpg-notification-mngr-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" diff --git a/infra/container_apps/env/prod-pnpg/terraform.tfvars b/infra/container_apps/env/prod-pnpg/terraform.tfvars index c39b9d5c0..fd886865a 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 = [ { name = "MAIL_TEMPLATE_COMPLETE_PATH" diff --git a/infra/container_apps/env/uat-pnpg/terraform.tfvars b/infra/container_apps/env/uat-pnpg/terraform.tfvars index 9a6c60653..0aa8e36b2 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 = [ { name = "DESTINATION_MAILS" @@ -156,11 +154,11 @@ app_settings = [ }, { name = "MS_NOTIFICATION_MANAGER_URL" - value = "https://selc-u-pnpg-notification-mngr-ca.redground-be752d1f.westeurope.azurecontainerapps.io" + value = "https://selc-u-pnpg-notification-mngr-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" diff --git a/infra/container_apps/env/uat/terraform.tfvars b/infra/container_apps/env/uat/terraform.tfvars index eaa733138..a237e6787 100644 --- a/infra/container_apps/env/uat/terraform.tfvars +++ b/infra/container_apps/env/uat/terraform.tfvars @@ -165,11 +165,11 @@ app_settings = [ }, { name = "MS_NOTIFICATION_MANAGER_URL" - value = "https://selc-u-notification-mngr-ca.calmsky-143987c1.westeurope.azurecontainerapps.io" + value = "https://selc-u-notification-mngr-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" diff --git a/infra/container_apps/main.tf b/infra/container_apps/main.tf index 633100c0a..46c211ba0 100644 --- a/infra/container_apps/main.tf +++ b/infra/container_apps/main.tf @@ -17,10 +17,9 @@ module "container_app_core" { container_app = var.container_app container_app_name = "ms-core" image_name = "selfcare-ms-core" - image_tag = "sha-61a02a8" + 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 } diff --git a/infra/container_apps/variables.tf b/infra/container_apps/variables.tf index 9960e93a6..a517b090a 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