Add registry to calico.yaml

More reverts

Replace docker.io with quay for calico

Author: willie-yao

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

@@ -17,3 +17,10 @@ installation:
       encapsulation: None
       natOutgoing: Enabled
       nodeSelector: all()
+    registry: quay.io
+# Image and registry configuration for the tigera/operator pod.
+tigeraOperator:
+  image: tigera/operator
+  registry: quay.io
+calicoctl:
+  image: quay.io/calico/ctl

templates/addons/calico-ipv6/values.yaml

@@ -12,3 +12,10 @@ installation:
       encapsulation: None
       natOutgoing: Enabled
       nodeSelector: all()
+    registry: quay.io
+# Image and registry configuration for the tigera/operator pod.Add commentMore actions
+tigeraOperator:
+  image: tigera/operator
+  registry: quay.io
+calicoctl:
+  image: quay.io/calico/ctl

templates/addons/calico.yaml

@@ -6063,7 +6063,7 @@ spec:
           value: node
         - name: DATASTORE_TYPE
           value: kubernetes
-        image: docker.io/calico/kube-controllers:v3.29.4
+        image: quay.io/calico/kube-controllers:v3.29.4
         imagePullPolicy: IfNotPresent
         livenessProbe:
           exec:
@@ -6181,7 +6181,7 @@ spec:
         - configMapRef:
             name: kubernetes-services-endpoint
             optional: true
-        image: docker.io/calico/node:v3.29.4
+        image: quay.io/calico/node:v3.29.4
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
@@ -6253,7 +6253,7 @@ spec:
         - configMapRef:
             name: kubernetes-services-endpoint
             optional: true
-        image: docker.io/calico/cni:v3.29.4
+        image: quay.io/calico/cni:v3.29.4
         imagePullPolicy: IfNotPresent
         name: upgrade-ipam
         securityContext:
@@ -6288,7 +6288,7 @@ spec:
         - configMapRef:
             name: kubernetes-services-endpoint
             optional: true
-        image: docker.io/calico/cni:v3.29.4
+        image: quay.io/calico/cni:v3.29.4
         imagePullPolicy: IfNotPresent
         name: install-cni
         securityContext:
@@ -6302,7 +6302,7 @@ spec:
         - calico-node
         - -init
         - -best-effort
-        image: docker.io/calico/node:v3.29.4
+        image: quay.io/calico/node:v3.29.4
         imagePullPolicy: IfNotPresent
         name: mount-bpffs
         securityContext:

templates/addons/calico/kustomization.yaml

@@ -12,3 +12,4 @@ patches:
     name: calico-kube-controllers
     namespace: kube-system
 - path: patches/azure-mtu.yaml
+- path: patches/replace-docker-with-quay.yaml

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

@@ -0,0 +1,30 @@
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: calico-node
+  namespace: kube-system
+spec:
+  template:
+    spec:
+      initContainers:
+      - name: upgrade-ipam
+        image: quay.io/calico/cni:v3.29.4
+      - name: install-cni
+        image: quay.io/calico/cni:v3.29.4
+      - name: mount-bpffs
+        image: quay.io/calico/node:v3.29.4
+      containers:
+      - name: calico-node
+        image: quay.io/calico/node:v3.29.4
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: calico-kube-controllers
+  namespace: kube-system
+spec:
+  template:
+    spec:
+      containers:
+      - name: calico-kube-controllers
+        image: quay.io/calico/kube-controllers:v3.29.4

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

@@ -31,3 +31,10 @@ spec:
           encapsulation: None
           natOutgoing: Enabled
           nodeSelector: all()
+        registry: quay.io
+      # Image and registry configuration for the tigera/operator pod.Add commentMore actions
+      tigeraOperator:
+        image: tigera/operator
+        registry: quay.io
+      calicoctl:
+        image: quay.io/calico/ctl

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

@@ -26,3 +26,10 @@ spec:
           encapsulation: None
           natOutgoing: Enabled
           nodeSelector: all(){{end}}
+        registry: quay.io
+      # Image and registry configuration for the tigera/operator pod.Add commentMore actions
+      tigeraOperator:
+        image: tigera/operator
+        registry: quay.io
+      calicoctl:
+        image: quay.io/calico/ctl

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

@@ -22,8 +22,13 @@ spec:
         ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
         - cidr: {{ $cidr }}
           encapsulation: VXLAN{{end}}
+        registry: quay.io
       serviceCIDRs:
         - 10.96.0.0/12 # must match cluster service CIDR (this is the default)
+      # Image and registry configuration for the tigera/operator pod
+      tigeraOperator:
+        image: tigera/operator
+        registry: quay.io
     # when kubernetesServiceEndpoint (required for windows) is added
     # DNS configuration is needed to look up the api server name properly
     # https://github.com/projectcalico/calico/issues/9536