Skip to content

Commit e9f89fe

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

File tree

47 files changed

+144
-144
lines changed

Some content is hidden

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

47 files changed

+144
-144
lines changed

‎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:v3.29.4
1212
- name: install-cni
13-
image: quay.io/calico/cni:v3.29.4
13+
image: capzcicommunity.azurecr.io/calico/cni:v3.29.4
1414
- name: mount-bpffs
15-
image: quay.io/calico/node:v3.29.4
15+
image: capzcicommunity.azurecr.io/calico/node:v3.29.4
1616
containers:
1717
- name: calico-node
18-
image: quay.io/calico/node:v3.29.4
18+
image: capzcicommunity.azurecr.io/calico/node:v3.29.4
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:v3.29.4

‎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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ spec:
3131
encapsulation: None
3232
natOutgoing: Enabled
3333
nodeSelector: all()
34-
registry: quay.io
34+
registry: capzcicommunity.azurecr.io
3535
# Image and registry configuration for the tigera/operator pod.
3636
tigeraOperator:
3737
image: tigera/operator
38-
registry: quay.io
38+
registry: capzcicommunity.azurecr.io
3939
calicoctl:
40-
image: quay.io/calico/ctl
40+
image: capzcicommunity.azurecr.io/calico/ctl
4141
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades
4242
# when it continuously gets scheduled onto an out-of-date Node that is being
4343
# deleted. Tolerate only the NoSchedule taints that are expected.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ spec:
2626
encapsulation: None
2727
natOutgoing: Enabled
2828
nodeSelector: all(){{end}}
29-
registry: quay.io
29+
registry: capzcicommunity.azurecr.io
3030
# Image and registry configuration for the tigera/operator pod.
3131
tigeraOperator:
3232
image: tigera/operator
33-
registry: quay.io
33+
registry: capzcicommunity.azurecr.io
3434
calicoctl:
35-
image: quay.io/calico/ctl
35+
image: capzcicommunity.azurecr.io/calico/ctl
3636
# By default, tigera tolerates all NoSchedule taints. This breaks upgrades
3737
# when it continuously gets scheduled onto an out-of-date Node that is being
3838
# deleted. Tolerate only the NoSchedule taints that are expected.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ spec:
2424
ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
2525
- cidr: {{ $cidr }}
2626
encapsulation: VXLAN{{end}}
27-
registry: quay.io
27+
registry: capzcicommunity.azurecr.io
2828
serviceCIDRs:
2929
- 10.96.0.0/12 # must match cluster service CIDR (this is the default)
3030
# Image and registry configuration for the tigera/operator pod
3131
tigeraOperator:
3232
image: tigera/operator
33-
registry: quay.io
33+
registry: capzcicommunity.azurecr.io
3434
calicoctl:
35-
image: quay.io/calico/ctl
35+
image: capzcicommunity.azurecr.io/calico/ctl
3636
# when kubernetesServiceEndpoint (required for windows) is added
3737
# DNS configuration is needed to look up the api server name properly
3838
# https://github.com/projectcalico/calico/issues/9536

‎templates/test/ci/cluster-template-prow-apiserver-ilb.yaml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)