diff --git a/.pipelines/templates/role-assignment.yaml b/.pipelines/templates/role-assignment.yaml index 2b1bdd366..483a9675a 100644 --- a/.pipelines/templates/role-assignment.yaml +++ b/.pipelines/templates/role-assignment.yaml @@ -14,11 +14,5 @@ steps: ROLE_ASSIGNMENT_IDS+="${ID} " fi - # permission for ACR - if [[ -n "$(REGISTRY_NAME)" ]]; then - ID="$(az role assignment create --assignee-object-id "${ASSIGNEE_OBJECT_ID}" --assignee-principal-type "ServicePrincipal" --role "AcrPull" --scope "/subscriptions/$(SUBSCRIPTION_ID)/resourceGroups/k8sbuildci/providers/Microsoft.ContainerRegistry/registries/$(REGISTRY_NAME)" --query id -otsv)" - ROLE_ASSIGNMENT_IDS+="${ID} " - fi - echo "##vso[task.setvariable variable=ROLE_ASSIGNMENT_IDS]${ROLE_ASSIGNMENT_IDS}" displayName: "Add role assignment" diff --git a/Makefile b/Makefile index e6baa2b58..b3d59965d 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ ORG_PATH=github.com/Azure PROJECT_NAME := secrets-store-csi-driver-provider-azure REPO_PATH="$(ORG_PATH)/$(PROJECT_NAME)" -REGISTRY_NAME ?= upstreamk8sci +REGISTRY_NAME ?= upstream REPO_PREFIX ?= k8s/csi/secrets-store REGISTRY ?= $(REGISTRY_NAME).azurecr.io/$(REPO_PREFIX) IMAGE_VERSION ?= v1.1.0