Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

unique deploy name for frontend-cert in differnt envs #968

Merged
merged 1 commit into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions dev-infrastructure/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -190,19 +190,17 @@ 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) \
--template-file templates/svc-infra.bicep \
$(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) \
Expand Down
2 changes: 1 addition & 1 deletion dev-infrastructure/templates/svc-infra.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading