From 2d8d412bcef4e4a8bea7853a6a4771e2d047f87f Mon Sep 17 00:00:00 2001
From: Gerd Oberlechner <goberlec@redhat.com>
Date: Fri, 20 Dec 2024 07:52:08 +0100
Subject: [PATCH] move persist tag management to *-infra.bicep

both svc and mgmt infra will manage the persist tag in the infra portion of their templates.
background: we want to be able to ramp infra without clusters for various testing purposes,
hence only the infra templates might run and RG tagging needs to run as part of that

Signed-off-by: Gerd Oberlechner <goberlec@redhat.com>
---
 dev-infrastructure/Makefile                    |  8 ++++++--
 dev-infrastructure/templates/svc-cluster.bicep | 11 -----------
 dev-infrastructure/templates/svc-infra.bicep   | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/dev-infrastructure/Makefile b/dev-infrastructure/Makefile
index 2c6511156..d22aa2d39 100644
--- a/dev-infrastructure/Makefile
+++ b/dev-infrastructure/Makefile
@@ -200,7 +200,9 @@ svc: svc.rg
 		--template-file templates/svc-infra.bicep \
 		$(PROMPT_TO_CONFIRM) \
 		--parameters \
-			configurations/svc-infra.bicepparam
+			configurations/svc-infra.bicepparam \
+		--parameters \
+			persist=${PERSIST}
 	@./ensure-no-running-deployment.sh $(SVC_RESOURCEGROUP) $(SVC_RG_DEPLOYMENT_NAME)
 	az deployment group create \
 		--name $(SVC_RG_DEPLOYMENT_NAME) \
@@ -322,7 +324,9 @@ mgmt: mgmt.wait mgmt.rg
 		--template-file templates/mgmt-infra.bicep \
 		$(PROMPT_TO_CONFIRM) \
 		--parameters \
-			configurations/mgmt-infra.bicepparam
+			configurations/mgmt-infra.bicepparam \
+		--parameters \
+			persist=${PERSIST}
 	@scripts/cleanup-orphaned-rolebindings.sh $(MGMT_RESOURCEGROUP)
 	az deployment group create \
 		--name $(MGMG_RG_DEPLOYMENT_NAME) \
diff --git a/dev-infrastructure/templates/svc-cluster.bicep b/dev-infrastructure/templates/svc-cluster.bicep
index d545ff494..2587539c0 100644
--- a/dev-infrastructure/templates/svc-cluster.bicep
+++ b/dev-infrastructure/templates/svc-cluster.bicep
@@ -147,17 +147,6 @@ resource serviceKeyVault 'Microsoft.KeyVault/vaults@2024-04-01-preview' existing
   scope: resourceGroup(serviceKeyVaultResourceGroup)
 }
 
-// Tags the resource group
-resource subscriptionTags 'Microsoft.Resources/tags@2024-03-01' = {
-  name: 'default'
-  scope: resourceGroup()
-  properties: {
-    tags: {
-      persist: toLower(string(persist))
-    }
-  }
-}
-
 module svcCluster '../modules/aks-cluster-base.bicep' = {
   name: 'cluster'
   scope: resourceGroup()
diff --git a/dev-infrastructure/templates/svc-infra.bicep b/dev-infrastructure/templates/svc-infra.bicep
index 339a5219b..d790bee1b 100644
--- a/dev-infrastructure/templates/svc-infra.bicep
+++ b/dev-infrastructure/templates/svc-infra.bicep
@@ -22,6 +22,20 @@ param certName string
 @description('This is a regional DNS zone')
 param regionalDNSZoneName string
 
+@description('Set to true to prevent resources from being pruned after 48 hours')
+param persist bool = false
+
+// Tags the resource group
+resource resourcegroupTags 'Microsoft.Resources/tags@2024-03-01' = {
+  name: 'default'
+  scope: resourceGroup()
+  properties: {
+    tags: {
+      persist: toLower(string(persist))
+    }
+  }
+}
+
 //
 //   K E Y V A U L T S
 //