From 37c60e0799863d32b719267675b34ba1962e2e84 Mon Sep 17 00:00:00 2001 From: Gerd Oberlechner Date: Thu, 12 Dec 2024 09:17:58 +0100 Subject: [PATCH] unique deploy name for frontend-cert in differnt envs (#968) this way deployments of different people won't block each other Signed-off-by: Gerd Oberlechner --- dev-infrastructure/Makefile | 8 +++----- dev-infrastructure/templates/svc-infra.bicep | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dev-infrastructure/Makefile b/dev-infrastructure/Makefile index 8a4bc5e97..1a42f1e60 100644 --- a/dev-infrastructure/Makefile +++ b/dev-infrastructure/Makefile @@ -190,12 +190,9 @@ svc.rg: fi .PHONY: svc.rg -svc.wait: - @./ensure-no-running-deployment.sh $(SVC_RESOURCEGROUP) $(SVC_RG_DEPLOYMENT_NAME) -.PHONY: svc.wait - -svc: svc.wait svc.rg +svc: svc.rg @scripts/cleanup-orphaned-rolebindings.sh $(SVC_RESOURCEGROUP) + @./ensure-no-running-deployment.sh $(SVC_RESOURCEGROUP) $(SVC_RG_DEPLOYMENT_NAME)-infra az deployment group create \ --name $(SVC_RG_DEPLOYMENT_NAME)-infra \ --resource-group $(SVC_RESOURCEGROUP) \ @@ -203,6 +200,7 @@ svc: svc.wait svc.rg $(PROMPT_TO_CONFIRM) \ --parameters \ configurations/svc-infra.bicepparam + @./ensure-no-running-deployment.sh $(SVC_RESOURCEGROUP) $(SVC_RG_DEPLOYMENT_NAME) az deployment group create \ --name $(SVC_RG_DEPLOYMENT_NAME) \ --resource-group $(SVC_RESOURCEGROUP) \ diff --git a/dev-infrastructure/templates/svc-infra.bicep b/dev-infrastructure/templates/svc-infra.bicep index 30f13861e..67eabe3db 100644 --- a/dev-infrastructure/templates/svc-infra.bicep +++ b/dev-infrastructure/templates/svc-infra.bicep @@ -46,7 +46,7 @@ output svcKeyVaultName string = serviceKeyVault.outputs.kvName var clientAuthenticationName = 'frontend.${regionalDNSZoneName}' module clientCertificate '../modules/keyvault/key-vault-cert.bicep' = { - name: 'frontend-cert' + name: 'frontend-cert-${uniqueString(certName)}' scope: resourceGroup(serviceKeyVaultResourceGroup) params: { keyVaultName: serviceKeyVault.outputs.kvName