diff --git a/acrpull/Makefile b/acrpull/Makefile index 24d4d8167..0725be220 100644 --- a/acrpull/Makefile +++ b/acrpull/Makefile @@ -6,7 +6,7 @@ deploy: kubectl create namespace acrpull --dry-run=client -o json | kubectl apply -f - && \ ${HELM_CMD} acrpull \ deploy/helm/acrpull/ \ - --set image=${ACRPULL_REPO}@${ACRPULL_DIGEST} \ + --set image=${ACRPULL_REGISTRY}/${ACRPULL_REPO}@${ACRPULL_DIGEST} \ --namespace acrpull .PHONY: deploy diff --git a/acrpull/pipeline.yaml b/acrpull/pipeline.yaml index 0948b0209..417f28344 100644 --- a/acrpull/pipeline.yaml +++ b/acrpull/pipeline.yaml @@ -18,6 +18,8 @@ resourceGroups: configRef: acrPull.image.digest - name: ACRPULL_REPO configRef: acrPull.image.repository + - name: ACRPULL_REGISTRY + configRef: acrPull.image.registry - name: {{ .mgmt.rg }} subscription: {{ .mgmt.subscription }} aksCluster: {{ .mgmt.aks.name }} @@ -34,3 +36,5 @@ resourceGroups: configRef: acrPull.image.digest - name: ACRPULL_REPO configRef: acrPull.image.repository + - name: ACRPULL_REGISTRY + configRef: acrPull.image.registry diff --git a/config/config.msft.yaml b/config/config.msft.yaml index 509189140..d0d3b81c3 100644 --- a/config/config.msft.yaml +++ b/config/config.msft.yaml @@ -18,7 +18,8 @@ defaults: # ACR Pull acrPull: image: - repository: mcr.microsoft.com/aks/msi-acrpull + registry: mcr.microsoft.com + repository: aks/msi-acrpull digest: sha256:51dd1a7c217b554d7925e67008caf747c8bec17b641830160e08b6836a8aa589 #v0.1.12 diff --git a/config/config.schema.json b/config/config.schema.json index 5fc12bc4e..9cdee3e16 100644 --- a/config/config.schema.json +++ b/config/config.schema.json @@ -100,6 +100,9 @@ "containerImage": { "type": "object", "properties": { + "registry": { + "type": "string" + }, "repository": { "type": "string" }, diff --git a/config/config.yaml b/config/config.yaml index af877bf41..c7af7c52f 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -13,7 +13,8 @@ defaults: # ACR Pull acrPull: image: - repository: mcr.microsoft.com/aks/msi-acrpull + registry: mcr.microsoft.com + repository: aks/msi-acrpull digest: sha256:51dd1a7c217b554d7925e67008caf747c8bec17b641830160e08b6836a8aa589 #v0.1.12 # Hypershift diff --git a/config/public-cloud-cs-pr.json b/config/public-cloud-cs-pr.json index b0560e3e4..28a514207 100644 --- a/config/public-cloud-cs-pr.json +++ b/config/public-cloud-cs-pr.json @@ -2,7 +2,8 @@ "acrPull": { "image": { "digest": "sha256:51dd1a7c217b554d7925e67008caf747c8bec17b641830160e08b6836a8aa589", - "repository": "mcr.microsoft.com/aks/msi-acrpull" + "registry": "mcr.microsoft.com", + "repository": "aks/msi-acrpull" } }, "armHelperCertName": "armHelperCert2", diff --git a/config/public-cloud-dev.json b/config/public-cloud-dev.json index 957c941f0..673f2585f 100644 --- a/config/public-cloud-dev.json +++ b/config/public-cloud-dev.json @@ -2,7 +2,8 @@ "acrPull": { "image": { "digest": "sha256:51dd1a7c217b554d7925e67008caf747c8bec17b641830160e08b6836a8aa589", - "repository": "mcr.microsoft.com/aks/msi-acrpull" + "registry": "mcr.microsoft.com", + "repository": "aks/msi-acrpull" } }, "armHelperCertName": "armHelperCert2", diff --git a/config/public-cloud-msft-int.json b/config/public-cloud-msft-int.json index 379c9e5ad..388f41016 100644 --- a/config/public-cloud-msft-int.json +++ b/config/public-cloud-msft-int.json @@ -2,7 +2,8 @@ "acrPull": { "image": { "digest": "sha256:51dd1a7c217b554d7925e67008caf747c8bec17b641830160e08b6836a8aa589", - "repository": "mcr.microsoft.com/aks/msi-acrpull" + "registry": "mcr.microsoft.com", + "repository": "aks/msi-acrpull" } }, "armHelperCertName": "armHelperCert2", diff --git a/config/public-cloud-personal-dev.json b/config/public-cloud-personal-dev.json index e560e5194..1ce1580eb 100644 --- a/config/public-cloud-personal-dev.json +++ b/config/public-cloud-personal-dev.json @@ -2,7 +2,8 @@ "acrPull": { "image": { "digest": "sha256:51dd1a7c217b554d7925e67008caf747c8bec17b641830160e08b6836a8aa589", - "repository": "mcr.microsoft.com/aks/msi-acrpull" + "registry": "mcr.microsoft.com", + "repository": "aks/msi-acrpull" } }, "armHelperCertName": "armHelperCert2", diff --git a/dev-infrastructure/mgmt-pipeline.yaml b/dev-infrastructure/mgmt-pipeline.yaml index d146ae54d..f8b9c5993 100644 --- a/dev-infrastructure/mgmt-pipeline.yaml +++ b/dev-infrastructure/mgmt-pipeline.yaml @@ -121,5 +121,7 @@ resourceGroups: configRef: acrPull.image.digest - name: ACRPULL_REPO configRef: acrPull.image.repository + - name: ACRPULL_REGISTRY + configRef: acrPull.image.registry dependsOn: - mgmt-cluster diff --git a/dev-infrastructure/svc-pipeline.yaml b/dev-infrastructure/svc-pipeline.yaml index eac9e2277..1b05edcc1 100644 --- a/dev-infrastructure/svc-pipeline.yaml +++ b/dev-infrastructure/svc-pipeline.yaml @@ -132,5 +132,7 @@ resourceGroups: configRef: acrPull.image.digest - name: ACRPULL_REPO configRef: acrPull.image.repository + - name: ACRPULL_REGISTRY + configRef: acrPull.image.registry dependsOn: - svc