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.

Sign up for GitHub

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

pipeline concurrency issues #1048

Merged
merged 1 commit into from
Jan 7, 2025
Merged

pipeline concurrency issues #1048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions dev-infrastructure/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,8 @@ svc.aks.admin-access:
.PHONY: svc.aks.admin-access

svc.aks.kubeconfig:
@scripts/aks-kubeconfig.sh $(SVC_RESOURCEGROUP) $(AKS_NAME) "$(SVC_KUBECONFIG_FILE)"
@az aks get-credentials --overwrite-existing --only-show-errors -n ${AKS_NAME} -g $(SVC_RESOURCEGROUP) -f "${SVC_KUBECONFIG_FILE}"
@kubelogin convert-kubeconfig -l azurecli --kubeconfig "${SVC_KUBECONFIG_FILE}"
.PHONY: svc.aks.kubeconfig

svc.aks.kubeconfigfile:
Expand All @@ -271,12 +272,14 @@ svc.init: region svc svc.aks.admin-access svc.aks.kubeconfig svc.istio metrics-i
.PHONY: svc.init

svc.what-if: svc.rg
@./ensure-no-running-deployment.sh $(SVC_RESOURCEGROUP) $(SVC_RG_DEPLOYMENT_NAME)-infra
az deployment group what-if \
--name $(SVC_RG_DEPLOYMENT_NAME)-infra \
--resource-group $(SVC_RESOURCEGROUP) \
--template-file templates/svc-infra.bicep \
--parameters \
configurations/svc-infra.bicepparam
@./ensure-no-running-deployment.sh $(SVC_RESOURCEGROUP) $(SVC_RG_DEPLOYMENT_NAME)
az deployment group what-if \
--name $(SVC_RG_DEPLOYMENT_NAME) \
--resource-group $(SVC_RESOURCEGROUP) \
Expand Down Expand Up @@ -358,8 +361,9 @@ mgmt.aks.admin-access:
@scripts/aks-admin-access.sh $(MGMT_RESOURCEGROUP) $(PRINCIPAL_ID)
.PHONY: mgmt.aks.admin-access

mgmt.aks.kubeconfig: mgmt.aks.kubeconfigfile
@scripts/aks-kubeconfig.sh $(MGMT_RESOURCEGROUP) $(AKS_NAME) "$(MGMT_KUBECONFIG_FILE)"
mgmt.aks.kubeconfig:
@az aks get-credentials --overwrite-existing --only-show-errors -n ${AKS_NAME} -g $(MGMT_RESOURCEGROUP) -f "${MGMT_KUBECONFIG_FILE}"
@kubelogin convert-kubeconfig -l azurecli --kubeconfig "${MGMT_KUBECONFIG_FILE}"
.PHONY: mgmt.aks.kubeconfig

mgmt.aks.kubeconfigfile:
Expand All @@ -370,12 +374,14 @@ mgmt.init: region mgmt mgmt.aks.admin-access mgmt.aks.kubeconfig metrics-infra m
.PHONY: mgmt.init

mgmt.what-if: mgmt.rg
@./ensure-no-running-deployment.sh $(MGMT_RESOURCEGROUP) $(MGMT_RESOURCEGROUP)-infra
az deployment group what-if \
--name $(MGMG_RG_DEPLOYMENT_NAME)-infra \
--resource-group $(MGMT_RESOURCEGROUP) \
--template-file templates/mgmt-infra.bicep \
--parameters \
configurations/mgmt-infra.bicepparam
@./ensure-no-running-deployment.sh $(MGMT_RESOURCEGROUP) $(MGMT_RESOURCEGROUP)
az deployment group what-if \
--name $(MGMG_RG_DEPLOYMENT_NAME) \
--resource-group $(MGMT_RESOURCEGROUP) \
Expand Down
2 changes: 1 addition & 1 deletion dev-infrastructure/modules/keyvault/key-vault-cert.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var boolstring = force == false ? '$false' : '$true'
param validityInMonths int = 12

module certificateOfficerAccess 'keyvault-secret-access.bicep' = {
name: 'kv-cert-officer-access-${keyVaultName}-${uniqueString(keyVaultManagedIdentityId)}'
name: 'kv-cert-officer-access-${keyVaultName}-${uniqueString(keyVaultManagedIdentityId, deployment().name)}'
params: {
keyVaultName: keyVaultName
roleName: 'Key Vault Certificates Officer'
Expand Down
9 changes: 0 additions & 9 deletions dev-infrastructure/scripts/aks-kubeconfig.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion dev-infrastructure/templates/svc-infra.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ output svcKeyVaultName string = serviceKeyVault.outputs.kvName
var clientAuthenticationName = 'frontend.${regionalDNSZoneName}'

module clientCertificate '../modules/keyvault/key-vault-cert.bicep' = {
name: 'frontend-cert-${uniqueString(certName)}'
name: 'frontend-cert-${uniqueString(resourceGroup().name)}'
scope: resourceGroup(serviceKeyVaultResourceGroup)
params: {
keyVaultName: serviceKeyVault.outputs.kvName
Expand Down
Loading