chore: update image registry to mcr.microsoft.com/oss/v2 (#1737)

aramase · web-flow · commit efc487041d4d · 2026-06-14T01:53:25.000-07:00
Signed-off-by: Anish Ramasekar &lt;anish.ramasekar@gmail.com&gt;
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-REGISTRY ?= mcr.microsoft.com/oss/azure/workload-identity
+REGISTRY ?= mcr.microsoft.com/oss/v2/azure/workload-identity
 PROXY_IMAGE_NAME := proxy
 INIT_IMAGE_NAME := proxy-init
 WEBHOOK_IMAGE_NAME := webhook
diff --git a/charts/workload-identity-webhook/README.md b/charts/workload-identity-webhook/README.md
@@ -32,7 +32,7 @@ helm upgrade -n azure-workload-identity-system [RELEASE_NAME] azure-workload-ide
 | Parameter                          | Description                                                                                                                       | Default                                                 |
 | :--------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------- | :------------------------------------------------------ |
 | replicaCount                       | The number of azure-workload-identity replicas to deploy for the webhook                                                          | `2`                                                     |
-| image.repository                   | Image repository                                                                                                                  | `mcr.microsoft.com/oss/azure/workload-identity/webhook` |
+| image.repository                   | Image repository                                                                                                                  | `mcr.microsoft.com/oss/v2/azure/workload-identity/webhook` |
 | image.pullPolicy                   | Image pullPolicy                                                                                                                  | `IfNotPresent`                                          |
 | image.release                      | The image release tag to use                                                                                                      | Current release version: `v1.6.0`                       |
 | imagePullSecrets                   | Image pull secrets to use for retrieving images from private registries                                                           | `[]`                                                    |
diff --git a/charts/workload-identity-webhook/values.yaml b/charts/workload-identity-webhook/values.yaml
@@ -4,7 +4,7 @@
 
 replicaCount: 2
 image:
-  repository: mcr.microsoft.com/oss/azure/workload-identity/webhook
+  repository: mcr.microsoft.com/oss/v2/azure/workload-identity/webhook
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   release: v1.6.0
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -4,7 +4,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: manager
-  newName: mcr.microsoft.com/oss/azure/workload-identity/webhook
+  newName: mcr.microsoft.com/oss/v2/azure/workload-identity/webhook
   newTag: v1.6.0
 configMapGenerator:
 - literals:
diff --git a/deploy/azure-wi-webhook.yaml b/deploy/azure-wi-webhook.yaml
@@ -160,7 +160,7 @@ spec:
         envFrom:
         - configMapRef:
             name: azure-wi-webhook-config
-        image: mcr.microsoft.com/oss/azure/workload-identity/webhook:v1.6.0
+        image: mcr.microsoft.com/oss/v2/azure/workload-identity/webhook:v1.6.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 6
diff --git a/examples/migration/pod-with-proxy-init-and-proxy-sidecar.yaml b/examples/migration/pod-with-proxy-init-and-proxy-sidecar.yaml
@@ -8,7 +8,7 @@ spec:
   serviceAccountName: workload-identity-sa
   initContainers:
   - name: init-networking
-    image: mcr.microsoft.com/oss/azure/workload-identity/proxy-init:v1.6.0
+    image: mcr.microsoft.com/oss/v2/azure/workload-identity/proxy-init:v1.6.0
     securityContext:
       capabilities:
         add:
@@ -26,6 +26,6 @@ spec:
     ports:
     - containerPort: 80
   - name: proxy
-    image: mcr.microsoft.com/oss/azure/workload-identity/proxy:v1.6.0
+    image: mcr.microsoft.com/oss/v2/azure/workload-identity/proxy:v1.6.0
     ports:
     - containerPort: 8000
diff --git a/manifest_staging/charts/workload-identity-webhook/README.md b/manifest_staging/charts/workload-identity-webhook/README.md
@@ -32,7 +32,7 @@ helm upgrade -n azure-workload-identity-system [RELEASE_NAME] azure-workload-ide
 | Parameter                          | Description                                                                                                                       | Default                                                 |
 | :--------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------- | :------------------------------------------------------ |
 | replicaCount                       | The number of azure-workload-identity replicas to deploy for the webhook                                                          | `2`                                                     |
-| image.repository                   | Image repository                                                                                                                  | `mcr.microsoft.com/oss/azure/workload-identity/webhook` |
+| image.repository                   | Image repository                                                                                                                  | `mcr.microsoft.com/oss/v2/azure/workload-identity/webhook` |
 | image.pullPolicy                   | Image pullPolicy                                                                                                                  | `IfNotPresent`                                          |
 | image.release                      | The image release tag to use                                                                                                      | Current release version: `v1.6.0`                       |
 | imagePullSecrets                   | Image pull secrets to use for retrieving images from private registries                                                           | `[]`                                                    |
diff --git a/manifest_staging/charts/workload-identity-webhook/values.yaml b/manifest_staging/charts/workload-identity-webhook/values.yaml
@@ -4,7 +4,7 @@
 
 replicaCount: 2
 image:
-  repository: mcr.microsoft.com/oss/azure/workload-identity/webhook
+  repository: mcr.microsoft.com/oss/v2/azure/workload-identity/webhook
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   release: v1.6.0
diff --git a/manifest_staging/deploy/azure-wi-webhook.yaml b/manifest_staging/deploy/azure-wi-webhook.yaml
@@ -160,7 +160,7 @@ spec:
         envFrom:
         - configMapRef:
             name: azure-wi-webhook-config
-        image: mcr.microsoft.com/oss/azure/workload-identity/webhook:v1.6.0
+        image: mcr.microsoft.com/oss/v2/azure/workload-identity/webhook:v1.6.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 6
diff --git a/pkg/cmd/podidentity/detect.go b/pkg/cmd/podidentity/detect.go
@@ -34,7 +34,7 @@ var (
 )
 
 const (
-	imageRepository = "mcr.microsoft.com/oss/azure/workload-identity"
+	imageRepository = "mcr.microsoft.com/oss/v2/azure/workload-identity"
 	imageTag        = "v1.6.0"
 
 	proxyInitImageName     = "proxy-init"
diff --git a/pkg/cmd/podidentity/detect_test.go b/pkg/cmd/podidentity/detect_test.go
@@ -143,13 +143,13 @@ func TestAddProxyInitContainers(t *testing.T) {
 			actualContainers: []corev1.Container{
 				{
 					Name:  "proxy-init",
-					Image: "mcr.microsoft.com/oss/azure/workload-identity/proxy-init:v0.8.0",
+					Image: "mcr.microsoft.com/oss/v2/azure/workload-identity/proxy-init:v0.8.0",
 				},
 			},
 			wantContainers: []corev1.Container{
 				{
 					Name:  "proxy-init",
-					Image: "mcr.microsoft.com/oss/azure/workload-identity/proxy-init:v0.8.0",
+					Image: "mcr.microsoft.com/oss/v2/azure/workload-identity/proxy-init:v0.8.0",
 				},
 			},
 		},
@@ -200,13 +200,13 @@ func TestAddProxyContainer(t *testing.T) {
 			actualContainers: []corev1.Container{
 				{
 					Name:  "proxy",
-					Image: "mcr.microsoft.com/oss/azure/workload-identity/proxy:v0.8.0",
+					Image: "mcr.microsoft.com/oss/v2/azure/workload-identity/proxy:v0.8.0",
 				},
 			},
 			wantContainers: []corev1.Container{
 				{
 					Name:  "proxy",
-					Image: "mcr.microsoft.com/oss/azure/workload-identity/proxy:v0.8.0",
+					Image: "mcr.microsoft.com/oss/v2/azure/workload-identity/proxy:v0.8.0",
 				},
 			},
 		},
diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh
@@ -102,7 +102,7 @@ test_helm_chart() {
   GINKGO_SKIP=Proxy\|Webhook\|AKSSoakOnly make test-e2e-run
 
   ${HELM} upgrade --install workload-identity-webhook "${REPO_ROOT}/manifest_staging/charts/workload-identity-webhook" \
-    --set image.repository="${REGISTRY:-mcr.microsoft.com/oss/azure/workload-identity/webhook}" \
+    --set image.repository="${REGISTRY:-mcr.microsoft.com/oss/v2/azure/workload-identity/webhook}" \
     --set image.release="${IMAGE_VERSION}" \
     --set azureTenantID="${AZURE_TENANT_ID}" \
     --set customTokenEndpoint.annotationSuffix="identity-binding" \
@@ -127,7 +127,7 @@ poll_webhook_readiness() {
 test_version_flag() {
   echo "Testing version flag for $1 image..."
   local image_name="$1"
-  message=$(docker run --platform linux/amd64 --quiet "${REGISTRY:-mcr.microsoft.com/oss/azure/workload-identity}/${image_name}:${IMAGE_VERSION}" --version 2>&1)
+  message=$(docker run --platform linux/amd64 --quiet "${REGISTRY:-mcr.microsoft.com/oss/v2/azure/workload-identity}/${image_name}:${IMAGE_VERSION}" --version 2>&1)
 
   # Validate that it's valid JSON
   if ! echo "$message" | jq empty > /dev/null 2>&1; then
diff --git a/third_party/open-policy-agent/gatekeeper/helmify/static/README.md b/third_party/open-policy-agent/gatekeeper/helmify/static/README.md
@@ -32,7 +32,7 @@ helm upgrade -n azure-workload-identity-system [RELEASE_NAME] azure-workload-ide
 | Parameter                          | Description                                                                                                                       | Default                                                 |
 | :--------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------- | :------------------------------------------------------ |
 | replicaCount                       | The number of azure-workload-identity replicas to deploy for the webhook                                                          | `2`                                                     |
-| image.repository                   | Image repository                                                                                                                  | `mcr.microsoft.com/oss/azure/workload-identity/webhook` |
+| image.repository                   | Image repository                                                                                                                  | `mcr.microsoft.com/oss/v2/azure/workload-identity/webhook` |
 | image.pullPolicy                   | Image pullPolicy                                                                                                                  | `IfNotPresent`                                          |
 | image.release                      | The image release tag to use                                                                                                      | Current release version: `v1.6.0`                       |
 | imagePullSecrets                   | Image pull secrets to use for retrieving images from private registries                                                           | `[]`                                                    |
diff --git a/third_party/open-policy-agent/gatekeeper/helmify/static/values.yaml b/third_party/open-policy-agent/gatekeeper/helmify/static/values.yaml
@@ -4,7 +4,7 @@
 
 replicaCount: 2
 image:
-  repository: mcr.microsoft.com/oss/azure/workload-identity/webhook
+  repository: mcr.microsoft.com/oss/v2/azure/workload-identity/webhook
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   release: v1.6.0

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-REGISTRY ?= mcr.microsoft.com/oss/azure/workload-identity`
	`1`	`+REGISTRY ?= mcr.microsoft.com/oss/v2/azure/workload-identity`
`2`	`2`	`PROXY_IMAGE_NAME := proxy`
`3`	`3`	`INIT_IMAGE_NAME := proxy-init`
`4`	`4`	`WEBHOOK_IMAGE_NAME := webhook`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ var (`
`34`	`34`	`)`
`35`	`35`
`36`	`36`	`const (`
`37`		`- imageRepository = "mcr.microsoft.com/oss/azure/workload-identity"`
	`37`	`+ imageRepository = "mcr.microsoft.com/oss/v2/azure/workload-identity"`
`38`	`38`	`imageTag = "v1.6.0"`
`39`	`39`
`40`	`40`	`proxyInitImageName = "proxy-init"`