fixup! Use capzicommunity ACR cache references for calico/tigera images

Author: marosset

Makefile

@@ -559,10 +559,9 @@ generate-e2e-templates: $(KUSTOMIZE) ## Generate Azure infrastructure templates
 	$(KUSTOMIZE) build $(AZURE_TEMPLATES)/v1beta1/cluster-template-aks --load-restrictor LoadRestrictionsNone > $(AZURE_TEMPLATES)/v1beta1/cluster-template-aks.yaml
 
 .PHONY: generate-addons
-generate-addons: fetch-calico-manifests ## Generate metric-server, calico, calico-ipv6, azure cni v1 addons.
-	$(KUSTOMIZE) build $(ADDONS_DIR)/metrics-server > $(ADDONS_DIR)/metrics-server/metrics-server.yaml
-	$(KUSTOMIZE) build $(ADDONS_DIR)/calico > $(ADDONS_DIR)/calico.yaml
+generate-addons: fetch-calico-manifests $(ENVSUBST)
 	$(KUSTOMIZE) build $(ADDONS_DIR)/metrics-server > $(ADDONS_DIR)/metrics-server/metrics-server.yaml
+	$(KUSTOMIZE) build $(ADDONS_DIR)/calico | $(ENVSUBST) > $(ADDONS_DIR)/calico.yaml
 	$(KUSTOMIZE) build $(ADDONS_DIR)/azure-cni-v1 > $(ADDONS_DIR)/azure-cni-v1.yaml
 
 .PHONY: generate-aso-crds
@@ -577,7 +576,6 @@ generate-aso-crds: $(YQ)
 		sed 's/\$$\$$/$$$$$$$$/g' \
 		> $(ASO_CRDS_PATH)
 
-# When updating this, make sure to also update the Windows image version in templates/addons/windows/calico.
 export CALICO_VERSION := v3.29.4
 # Where all downloaded Calico manifests are unpacked and stored.
 CALICO_RELEASES := $(ARTIFACTS)/calico

templates/addons/calico/patches/use-capz-acr.yaml

@@ -8,14 +8,14 @@ spec:
     spec:
       initContainers:
       - name: upgrade-ipam
-        image: capzcicommunity.azurecr.io/calico/cni:v3.29.4
+        image: capzcicommunity.azurecr.io/calico/cni:${CALICO_VERSION}
       - name: install-cni
-        image: capzcicommunity.azurecr.io/calico/cni:v3.29.4
+        image: capzcicommunity.azurecr.io/calico/cni:${CALICO_VERSION}
       - name: mount-bpffs
-        image: capzcicommunity.azurecr.io/calico/node:v3.29.4
+        image: capzcicommunity.azurecr.io/calico/node:${CALICO_VERSION}
       containers:
       - name: calico-node
-        image: capzcicommunity.azurecr.io/calico/node:v3.29.4
+        image: capzcicommunity.azurecr.io/calico/node:${CALICO_VERSION}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -27,4 +27,4 @@ spec:
     spec:
       containers:
       - name: calico-kube-controllers
-        image: capzcicommunity.azurecr.io/calico/kube-controllers:v3.29.4
+        image: capzcicommunity.azurecr.io/calico/kube-controllers:${CALICO_VERSION}