Skip to content

Commit 7e5d556

Browse files
marossetmarosset
committed
Use capzicommunity ACR cache references for calico/tigera images
Signed-off-by: Mark Rossett <[email protected]>
1 parent cb226b1 commit 7e5d556

File tree

54 files changed

+316
-972
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+316
-972
lines changed

‎Makefile‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -559,10 +559,9 @@ generate-e2e-templates: $(KUSTOMIZE) ## Generate Azure infrastructure templates
559559
$(KUSTOMIZE) build $(AZURE_TEMPLATES)/v1beta1/cluster-template-aks --load-restrictor LoadRestrictionsNone > $(AZURE_TEMPLATES)/v1beta1/cluster-template-aks.yaml
560560

561561
.PHONY: generate-addons
562-
generate-addons: fetch-calico-manifests ## Generate metric-server, calico, calico-ipv6, azure cni v1 addons.
563-
$(KUSTOMIZE) build $(ADDONS_DIR)/metrics-server > $(ADDONS_DIR)/metrics-server/metrics-server.yaml
564-
$(KUSTOMIZE) build $(ADDONS_DIR)/calico > $(ADDONS_DIR)/calico.yaml
562+
generate-addons: fetch-calico-manifests $(ENVSUBST)
565563
$(KUSTOMIZE) build $(ADDONS_DIR)/metrics-server > $(ADDONS_DIR)/metrics-server/metrics-server.yaml
564+
$(KUSTOMIZE) build $(ADDONS_DIR)/calico | $(ENVSUBST) > $(ADDONS_DIR)/calico.yaml
566565
$(KUSTOMIZE) build $(ADDONS_DIR)/azure-cni-v1 > $(ADDONS_DIR)/azure-cni-v1.yaml
567566

568567
.PHONY: generate-aso-crds
@@ -577,7 +576,6 @@ generate-aso-crds: $(YQ)
577576
sed 's/\$$\$$/$$$$$$$$/g' \
578577
> $(ASO_CRDS_PATH)
579578

580-
# When updating this, make sure to also update the Windows image version in templates/addons/windows/calico.
581579
export CALICO_VERSION := v3.29.4
582580
# Where all downloaded Calico manifests are unpacked and stored.
583581
CALICO_RELEASES := $(ARTIFACTS)/calico

‎templates/addons/calico-dual-stack/values.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ installation:
1717
encapsulation: None
1818
natOutgoing: Enabled
1919
nodeSelector: all()
20-
registry: quay.io
20+
registry: capzcicommunity.azurecr.io
2121
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades
2222
# when it continuously gets scheduled onto an out-of-date Node that is being
2323
# deleted. Tolerate only the NoSchedule taints that are expected.
@@ -33,6 +33,6 @@ tolerations:
3333
# Image and registry configuration for the tigera/operator pod.
3434
tigeraOperator:
3535
image: tigera/operator
36-
registry: quay.io
36+
registry: capzcicommunity.azurecr.io
3737
calicoctl:
38-
image: quay.io/calico/ctl
38+
image: capzcicommunity.azurecr.io/calico/ctl

‎templates/addons/calico-ipv6/values.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ installation:
1212
encapsulation: None
1313
natOutgoing: Enabled
1414
nodeSelector: all()
15-
registry: quay.io
15+
registry: capzcicommunity.azurecr.io
1616
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades
1717
# when it continuously gets scheduled onto an out-of-date Node that is being
1818
# deleted. Tolerate only the NoSchedule taints that are expected.
@@ -28,6 +28,6 @@ tolerations:
2828
# Image and registry configuration for the tigera/operator pod.Add commentMore actions
2929
tigeraOperator:
3030
image: tigera/operator
31-
registry: quay.io
31+
registry: capzcicommunity.azurecr.io
3232
calicoctl:
33-
image: quay.io/calico/ctl
33+
image: capzcicommunity.azurecr.io/calico/ctl

‎templates/addons/calico.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6063,7 +6063,7 @@ spec:
60636063
value: node
60646064
- name: DATASTORE_TYPE
60656065
value: kubernetes
6066-
image: quay.io/calico/kube-controllers:v3.29.4
6066+
image: capzcicommunity.azurecr.io/calico/kube-controllers:v3.29.4
60676067
imagePullPolicy: IfNotPresent
60686068
livenessProbe:
60696069
exec:
@@ -6181,7 +6181,7 @@ spec:
61816181
- configMapRef:
61826182
name: kubernetes-services-endpoint
61836183
optional: true
6184-
image: quay.io/calico/node:v3.29.4
6184+
image: capzcicommunity.azurecr.io/calico/node:v3.29.4
61856185
imagePullPolicy: IfNotPresent
61866186
lifecycle:
61876187
preStop:
@@ -6253,7 +6253,7 @@ spec:
62536253
- configMapRef:
62546254
name: kubernetes-services-endpoint
62556255
optional: true
6256-
image: quay.io/calico/cni:v3.29.4
6256+
image: capzcicommunity.azurecr.io/calico/cni:v3.29.4
62576257
imagePullPolicy: IfNotPresent
62586258
name: upgrade-ipam
62596259
securityContext:
@@ -6288,7 +6288,7 @@ spec:
62886288
- configMapRef:
62896289
name: kubernetes-services-endpoint
62906290
optional: true
6291-
image: quay.io/calico/cni:v3.29.4
6291+
image: capzcicommunity.azurecr.io/calico/cni:v3.29.4
62926292
imagePullPolicy: IfNotPresent
62936293
name: install-cni
62946294
securityContext:
@@ -6302,7 +6302,7 @@ spec:
63026302
- calico-node
63036303
- -init
63046304
- -best-effort
6305-
image: quay.io/calico/node:v3.29.4
6305+
image: capzcicommunity.azurecr.io/calico/node:v3.29.4
63066306
imagePullPolicy: IfNotPresent
63076307
name: mount-bpffs
63086308
securityContext:

‎templates/addons/calico/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ patches:
1212
name: calico-kube-controllers
1313
namespace: kube-system
1414
- path: patches/azure-mtu.yaml
15-
- path: patches/replace-docker-with-quay.yaml
15+
- path: patches/use-capz-acr.yaml

‎templates/addons/calico/patches/replace-docker-with-quay.yaml‎ renamed to ‎templates/addons/calico/patches/use-capz-acr.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ spec:
88
spec:
99
initContainers:
1010
- name: upgrade-ipam
11-
image: quay.io/calico/cni:v3.29.4
11+
image: capzcicommunity.azurecr.io/calico/cni:${CALICO_VERSION}
1212
- name: install-cni
13-
image: quay.io/calico/cni:v3.29.4
13+
image: capzcicommunity.azurecr.io/calico/cni:${CALICO_VERSION}
1414
- name: mount-bpffs
15-
image: quay.io/calico/node:v3.29.4
15+
image: capzcicommunity.azurecr.io/calico/node:${CALICO_VERSION}
1616
containers:
1717
- name: calico-node
18-
image: quay.io/calico/node:v3.29.4
18+
image: capzcicommunity.azurecr.io/calico/node:${CALICO_VERSION}
1919
---
2020
apiVersion: apps/v1
2121
kind: Deployment
@@ -27,4 +27,4 @@ spec:
2727
spec:
2828
containers:
2929
- name: calico-kube-controllers
30-
image: quay.io/calico/kube-controllers:v3.29.4
30+
image: capzcicommunity.azurecr.io/calico/kube-controllers:${CALICO_VERSION}

‎templates/addons/calico/values.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ installation:
1010
- cidr: 192.168.0.0/16
1111
encapsulation: VXLAN
1212
windowsDataplane: HNS
13-
registry: quay.io
13+
registry: capzcicommunity.azurecr.io
1414
# Image and registry configuration for the tigera/operator pod.
1515
tigeraOperator:
1616
image: tigera/operator
17-
registry: quay.io
17+
registry: capzcicommunity.azurecr.io
1818
calicoctl:
19-
image: quay.io/calico/ctl
19+
image: capzcicommunity.azurecr.io/calico/ctl
2020
serviceCIDRs:
2121
- 10.96.0.0/12 # must match cluster service CIDR (this is the default)
2222
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades

‎templates/addons/cluster-api-helm/calico-dual-stack.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ spec:
5656
matchExpressions:
5757
- key: node-role.kubernetes.io/control-plane
5858
operator: Exists
59-
registry: quay.io
60-
# Image and registry configuration for the tigera/operator pod.
61-
tigeraOperator:
62-
image: tigera/operator
63-
registry: quay.io
64-
calicoctl:
65-
image: quay.io/calico/ctl
59+
registry: capzcicommunity.azurecr.io
60+
# Image and registry configuration for the tigera/operator pod.
61+
tigeraOperator:
62+
image: tigera/operator
63+
registry: capzcicommunity.azurecr.io
64+
calicoctl:
65+
image: capzcicommunity.azurecr.io/calico/ctl
6666
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades
6767
# when it continuously gets scheduled onto an out-of-date Node that is being
6868
# deleted. Tolerate only the NoSchedule taints that are expected.

‎templates/addons/cluster-api-helm/calico-ipv6.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ spec:
5151
matchExpressions:
5252
- key: node-role.kubernetes.io/control-plane
5353
operator: Exists
54-
registry: quay.io
55-
# Image and registry configuration for the tigera/operator pod.
56-
tigeraOperator:
57-
image: tigera/operator
58-
registry: quay.io
59-
calicoctl:
60-
image: quay.io/calico/ctl
54+
registry: capzcicommunity.azurecr.io
55+
# Image and registry configuration for the tigera/operator pod.
56+
tigeraOperator:
57+
image: tigera/operator
58+
registry: capzcicommunity.azurecr.io
59+
calicoctl:
60+
image: capzcicommunity.azurecr.io/calico/ctl
6161
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades
6262
# when it continuously gets scheduled onto an out-of-date Node that is being
6363
# deleted. Tolerate only the NoSchedule taints that are expected.

‎templates/addons/cluster-api-helm/calico.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ spec:
4949
matchExpressions:
5050
- key: node-role.kubernetes.io/control-plane
5151
operator: Exists
52-
registry: quay.io
52+
registry: capzcicommunity.azurecr.io
5353
serviceCIDRs:
5454
- 10.96.0.0/12 # must match cluster service CIDR (this is the default)
55-
# Image and registry configuration for the tigera/operator pod
56-
tigeraOperator:
57-
image: tigera/operator
58-
registry: quay.io
59-
calicoctl:
60-
image: quay.io/calico/ctl
55+
# Image and registry configuration for the tigera/operator pod
56+
tigeraOperator:
57+
image: tigera/operator
58+
registry: capzcicommunity.azurecr.io
59+
calicoctl:
60+
image: capzcicommunity.azurecr.io/calico/ctl
6161
# when kubernetesServiceEndpoint (required for windows) is added
6262
# DNS configuration is needed to look up the api server name properly
6363
# https://github.com/projectcalico/calico/issues/9536

0 commit comments

Comments
 (0)