From 3f0af2d4d87d7ca374f0a4e9ea81071111c5f327 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Thu, 15 Aug 2024 10:43:40 +0100 Subject: [PATCH 1/3] Use count to only create consumption_budget_subscription resource if budget_alert_enabled is true --- terraform/azure/budget-alerts.tf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/terraform/azure/budget-alerts.tf b/terraform/azure/budget-alerts.tf index 3b697dc800..4f359be9ee 100644 --- a/terraform/azure/budget-alerts.tf +++ b/terraform/azure/budget-alerts.tf @@ -1,5 +1,7 @@ data "azurerm_subscription" "current" {} resource "azurerm_consumption_budget_subscription" "budget" { + count = var.budget_alert_enabled ? 1 : 0 + name = "BudgetSubscription-${var.resourcegroup_name}" subscription_id = data.azurerm_subscription.current.id @@ -12,7 +14,7 @@ resource "azurerm_consumption_budget_subscription" "budget" { } notification { - enabled = var.budget_alert_enabled ? true : false + enabled = true threshold = 120 operator = "GreaterThanOrEqualTo" threshold_type = "Forecasted" From 5432c90085d9d17f6afc20542295f3749c67ad39 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Thu, 15 Aug 2024 10:44:39 +0100 Subject: [PATCH 2/3] Set a null budget alert value for UToronto so we are not asked for this variable on the command line --- terraform/azure/projects/utoronto.tfvars | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/terraform/azure/projects/utoronto.tfvars b/terraform/azure/projects/utoronto.tfvars index 6dddc485cb..3e0e613127 100644 --- a/terraform/azure/projects/utoronto.tfvars +++ b/terraform/azure/projects/utoronto.tfvars @@ -12,14 +12,13 @@ resourcegroup_name = "2i2c-utoronto-cluster" global_container_registry_name = "2i2cutorontohubregistry" global_storage_account_name = "2i2cutorontohubstorage" location = "canadacentral" - +budget_alert_amount = null storage_size = 10240 ssh_pub_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQJ4h39UYNi1wybxAH+jCFkNK2aqRcuhDkQSMx0Hak5xkbt3KnT3cOwAgUP1Vt/SjhltSTuxpOHxiAKCRnjwRk60SxKhUNzPHih2nkfYTmBBjmLfdepDPSke/E0VWvTDIEXz/L8vW8aI0QGPXnXyqzEDO9+U1buheBlxB0diFAD3vEp2SqBOw+z7UgrGxXPdP+2b3AV+X6sOtd6uSzpV8Qvdh+QAkd4r7h9JrkFvkrUzNFAGMjlTb0Lz7qAlo4ynjEwzVN2I1i7cVDKgsGz9ZG/8yZfXXx+INr9jYtYogNZ63ajKR/dfjNPovydhuz5zQvQyxpokJNsTqt1CiWEUNj georgiana@georgiana" # List available versions via: az aks get-versions --location westus2 -o table kubernetes_version = "1.28.3" - # Ref https://github.com/2i2c-org/meta/issues/539 kubernetes_rbac_enabled = false From cc0d54ac8d2538408e436af8d9e928d888448ddf Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 09:47:46 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- terraform/azure/projects/utoronto.tfvars | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/azure/projects/utoronto.tfvars b/terraform/azure/projects/utoronto.tfvars index 3e0e613127..99a23901a8 100644 --- a/terraform/azure/projects/utoronto.tfvars +++ b/terraform/azure/projects/utoronto.tfvars @@ -12,9 +12,9 @@ resourcegroup_name = "2i2c-utoronto-cluster" global_container_registry_name = "2i2cutorontohubregistry" global_storage_account_name = "2i2cutorontohubstorage" location = "canadacentral" -budget_alert_amount = null -storage_size = 10240 -ssh_pub_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQJ4h39UYNi1wybxAH+jCFkNK2aqRcuhDkQSMx0Hak5xkbt3KnT3cOwAgUP1Vt/SjhltSTuxpOHxiAKCRnjwRk60SxKhUNzPHih2nkfYTmBBjmLfdepDPSke/E0VWvTDIEXz/L8vW8aI0QGPXnXyqzEDO9+U1buheBlxB0diFAD3vEp2SqBOw+z7UgrGxXPdP+2b3AV+X6sOtd6uSzpV8Qvdh+QAkd4r7h9JrkFvkrUzNFAGMjlTb0Lz7qAlo4ynjEwzVN2I1i7cVDKgsGz9ZG/8yZfXXx+INr9jYtYogNZ63ajKR/dfjNPovydhuz5zQvQyxpokJNsTqt1CiWEUNj georgiana@georgiana" +budget_alert_amount = null +storage_size = 10240 +ssh_pub_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQJ4h39UYNi1wybxAH+jCFkNK2aqRcuhDkQSMx0Hak5xkbt3KnT3cOwAgUP1Vt/SjhltSTuxpOHxiAKCRnjwRk60SxKhUNzPHih2nkfYTmBBjmLfdepDPSke/E0VWvTDIEXz/L8vW8aI0QGPXnXyqzEDO9+U1buheBlxB0diFAD3vEp2SqBOw+z7UgrGxXPdP+2b3AV+X6sOtd6uSzpV8Qvdh+QAkd4r7h9JrkFvkrUzNFAGMjlTb0Lz7qAlo4ynjEwzVN2I1i7cVDKgsGz9ZG/8yZfXXx+INr9jYtYogNZ63ajKR/dfjNPovydhuz5zQvQyxpokJNsTqt1CiWEUNj georgiana@georgiana" # List available versions via: az aks get-versions --location westus2 -o table kubernetes_version = "1.28.3"