From f4c7ac447959a3f25d424a972c9cb22b7245f468 Mon Sep 17 00:00:00 2001 From: Gerd Oberlechner Date: Sat, 26 Oct 2024 19:39:51 +0200 Subject: [PATCH] cleanup Signed-off-by: Gerd Oberlechner --- cluster-service/Makefile | 2 +- cluster-service/config.tmpl.mk | 2 +- dev-infrastructure/Makefile | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cluster-service/Makefile b/cluster-service/Makefile index 2a810ba81..44a745d04 100644 --- a/cluster-service/Makefile +++ b/cluster-service/Makefile @@ -28,7 +28,7 @@ deploy: -p CS_SERVICE_PRINCIPAL_CREDS_BASE64=$${CS_SERVICE_PRINCIPAL_CREDS_BASE64} \ -p IMAGE_REGISTRY=${ACR_NAME}.azurecr.io \ -p IMAGE_REPOSITORY=${IMAGE_REPO} \ - -p AZURE_FIRST_PARTY_APPLICATION_CLIENT_ID=${FPA_CLIENT_ID} \ + -p AZURE_FIRST_PARTY_APPLICATION_CLIENT_ID=${AZURE_FIRST_PARTY_APPLICATION_CLIENT_ID} \ -p FPA_CERT_NAME=${FPA_CERT_NAME} \ -p IMAGE_TAG=${IMAGE_TAG} | oc apply -f - diff --git a/cluster-service/config.tmpl.mk b/cluster-service/config.tmpl.mk index 50664d97b..e73cc967b 100644 --- a/cluster-service/config.tmpl.mk +++ b/cluster-service/config.tmpl.mk @@ -8,6 +8,6 @@ OIDC_STORAGE_ACCOUNT ?= {{ .oidcStorageAccountName }} IMAGE_REPO ?= {{ .clusterServiceImageRepo }} IMAGE_TAG ?= {{ .clusterServiceImageTag }} ACR_NAME ?= {{ .acrName }} -FPA_CLIENT_ID ?= {{ .firstPartyAppClientId }} +AZURE_FIRST_PARTY_APPLICATION_CLIENT_ID ?= {{ .firstPartyAppClientId }} FPA_CERT_NAME ?= firstPartyCert ZONE_RESOURCE_ID ?= $(shell az network dns zone show -n {{ .regionalDNSSubdomain }}.{{ .baseDnsZoneName }} -g {{ .regionRG }} --query id -o tsv) diff --git a/dev-infrastructure/Makefile b/dev-infrastructure/Makefile index 6aba57096..4be329483 100644 --- a/dev-infrastructure/Makefile +++ b/dev-infrastructure/Makefile @@ -46,6 +46,7 @@ cleanup-orphaned-rolebindings: @scripts/cleanup-orphaned-rolebindings.sh $(MGMT_RESOURCEGROUP) @scripts/cleanup-orphaned-rolebindings.sh $(REGIONAL_RESOURCEGROUP) @scripts/cleanup-orphaned-rolebindings.sh ${GLOBAL_RESOURCEGROUP} + @scripts/cleanup-orphaned-rolebindings.sh ${IMAGE_SYNC_RESOURCEGROUP} .PHONY: cleanup-orphaned-rolebindings create-mock-identities: @@ -154,7 +155,7 @@ region.what-if: regionalRg --template-file templates/region.bicep \ --parameters \ configurations/region.bicepparam -.PHONY: region +.PHONY: region.what-if # # Service Cluster