Skip to content

Commit f9e9546

Browse files
willie-yaowillie-yao
committed
Use quay instead of docker for calico images
1 parent 1010238 commit f9e9546

File tree

47 files changed

+336
-12
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

+336
-12
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,10 @@ installation:
1717
encapsulation: None
1818
natOutgoing: Enabled
1919
nodeSelector: all()
20+
registry: quay.io
21+
# Image and registry configuration for the tigera/operator pod.
22+
tigeraOperator:
23+
image: tigera/operator
24+
registry: quay.io
25+
calicoctl:
26+
image: quay.io/calico/ctl

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,10 @@ installation:
1212
encapsulation: None
1313
natOutgoing: Enabled
1414
nodeSelector: all()
15+
registry: quay.io
16+
# Image and registry configuration for the tigera/operator pod.Add commentMore actions
17+
tigeraOperator:
18+
image: tigera/operator
19+
registry: quay.io
20+
calicoctl:
21+
image: quay.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: docker.io/calico/kube-controllers:v3.29.4
6066+
image: quay.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: docker.io/calico/node:v3.29.4
6184+
image: quay.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: docker.io/calico/cni:v3.29.4
6256+
image: quay.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: docker.io/calico/cni:v3.29.4
6291+
image: quay.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: docker.io/calico/node:v3.29.4
6305+
image: quay.io/calico/node:v3.29.4
63066306
imagePullPolicy: IfNotPresent
63076307
name: mount-bpffs
63086308
securityContext:

‎templates/addons/calico/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +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

‎templates/addons/calico/patches/replace-docker-with-quay.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
apiVersion: apps/v1
2+
kind: DaemonSet
3+
metadata:
4+
name: calico-node
5+
namespace: kube-system
6+
spec:
7+
template:
8+
spec:
9+
initContainers:
10+
- name: upgrade-ipam
11+
image: quay.io/calico/cni:v3.29.4
12+
- name: install-cni
13+
image: quay.io/calico/cni:v3.29.4
14+
- name: mount-bpffs
15+
image: quay.io/calico/node:v3.29.4
16+
containers:
17+
- name: calico-node
18+
image: quay.io/calico/node:v3.29.4
19+
---
20+
apiVersion: apps/v1
21+
kind: Deployment
22+
metadata:
23+
name: calico-kube-controllers
24+
namespace: kube-system
25+
spec:
26+
template:
27+
spec:
28+
containers:
29+
- name: calico-kube-controllers
30+
image: quay.io/calico/kube-controllers:v3.29.4

‎templates/addons/calico/values.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,12 @@ installation:
1010
- cidr: 192.168.0.0/16
1111
encapsulation: VXLAN
1212
windowsDataplane: HNS
13+
registry: quay.io
14+
# Image and registry configuration for the tigera/operator pod.
15+
tigeraOperator:
16+
image: tigera/operator
17+
registry: quay.io
18+
calicoctl:
19+
image: quay.io/calico/ctl
1320
serviceCIDRs:
1421
- 10.96.0.0/12 # must match cluster service CIDR (this is the default)

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,10 @@ spec:
3131
encapsulation: None
3232
natOutgoing: Enabled
3333
nodeSelector: all()
34+
registry: quay.io
35+
# Image and registry configuration for the tigera/operator pod.Add commentMore actions
36+
tigeraOperator:
37+
image: tigera/operator
38+
registry: quay.io
39+
calicoctl:
40+
image: quay.io/calico/ctl

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,10 @@ spec:
2626
encapsulation: None
2727
natOutgoing: Enabled
2828
nodeSelector: all(){{end}}
29+
registry: quay.io
30+
# Image and registry configuration for the tigera/operator pod.Add commentMore actions
31+
tigeraOperator:
32+
image: tigera/operator
33+
registry: quay.io
34+
calicoctl:
35+
image: quay.io/calico/ctl

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,15 @@ spec:
2424
ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
2525
- cidr: {{ $cidr }}
2626
encapsulation: VXLAN{{end}}
27+
registry: quay.io
2728
serviceCIDRs:
2829
- 10.96.0.0/12 # must match cluster service CIDR (this is the default)
30+
# Image and registry configuration for the tigera/operator pod
31+
tigeraOperator:
32+
image: tigera/operator
33+
registry: quay.io
34+
calicoctl:
35+
image: quay.io/calico/ctl
2936
# when kubernetesServiceEndpoint (required for windows) is added
3037
# DNS configuration is needed to look up the api server name properly
3138
# https://github.com/projectcalico/calico/issues/9536

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

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

0 commit comments

Comments
 (0)