From 90ab0c1a7b6dfce8b73441f4823e5efe82e49d95 Mon Sep 17 00:00:00 2001
From: Jimmi Dyson <jimmidyson@gmail.com>
Date: Mon, 20 May 2024 13:58:30 +0100
Subject: [PATCH] feat: Pull calico images from quay.io instead of docker hub

This reduces need for Docker Hub credentials by pulling images from
another registry that has Calico images pushed to on new Calico
releases.
---
 .../templates/cni/calico/manifests/aws/crs-installation.yaml     | 1 +
 .../cni/calico/manifests/aws/helm-addon-installation.yaml        | 1 +
 .../templates/cni/calico/manifests/docker/crs-installation.yaml  | 1 +
 .../cni/calico/manifests/docker/helm-addon-installation.yaml     | 1 +
 .../templates/cni/calico/manifests/nutanix/crs-installation.yaml | 1 +
 .../cni/calico/manifests/nutanix/helm-addon-installation.yaml    | 1 +
 6 files changed, 6 insertions(+)

diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/aws/crs-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/aws/crs-installation.yaml
index 98b06f756..62f56ab87 100644
--- a/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/aws/crs-installation.yaml
+++ b/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/aws/crs-installation.yaml
@@ -32,5 +32,6 @@ data:
         bgp: Enabled
       nodeMetricsPort: 9091
       typhaMetricsPort: 9093
+      registry: quay.io/
 {{- end -}}
 {{- end -}}
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/aws/helm-addon-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/aws/helm-addon-installation.yaml
index e94a153e2..58c9ed47e 100644
--- a/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/aws/helm-addon-installation.yaml
+++ b/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/aws/helm-addon-installation.yaml
@@ -20,4 +20,5 @@ data:
           nodeSelector: all(){{ printf "{{ end }}" }}
       nodeMetricsPort: 9091
       typhaMetricsPort: 9093
+      registry: quay.io/
 {{- end -}}
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/docker/crs-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/docker/crs-installation.yaml
index 30d9ecee3..35b7aa056 100644
--- a/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/docker/crs-installation.yaml
+++ b/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/docker/crs-installation.yaml
@@ -31,5 +31,6 @@ data:
           nodeSelector: all()
       nodeMetricsPort: 9091
       typhaMetricsPort: 9093
+      registry: quay.io/
 {{- end -}}
 {{- end -}}
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/docker/helm-addon-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/docker/helm-addon-installation.yaml
index 0256f4e6d..266ab71f0 100644
--- a/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/docker/helm-addon-installation.yaml
+++ b/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/docker/helm-addon-installation.yaml
@@ -19,4 +19,5 @@ data:
           nodeSelector: all(){{ printf "{{ end }}" }}
       nodeMetricsPort: 9091
       typhaMetricsPort: 9093
+      registry: quay.io/
 {{- end -}}
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/nutanix/crs-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/nutanix/crs-installation.yaml
index b3892a8c9..7f098cf37 100644
--- a/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/nutanix/crs-installation.yaml
+++ b/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/nutanix/crs-installation.yaml
@@ -32,5 +32,6 @@ data:
         bgp: Enabled
       nodeMetricsPort: 9091
       typhaMetricsPort: 9093
+      registry: quay.io/
 {{- end -}}
 {{- end -}}
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/nutanix/helm-addon-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/nutanix/helm-addon-installation.yaml
index 996e320f6..e1d87fd68 100644
--- a/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/nutanix/helm-addon-installation.yaml
+++ b/charts/cluster-api-runtime-extensions-nutanix/templates/cni/calico/manifests/nutanix/helm-addon-installation.yaml
@@ -20,4 +20,5 @@ data:
           nodeSelector: all(){{ printf "{{ end }}" }}
       nodeMetricsPort: 9091
       typhaMetricsPort: 9093
+      registry: quay.io/
 {{- end -}}