From 1fadfe534f1f78d6eeb351423fc9363989748524 Mon Sep 17 00:00:00 2001
From: Matt Boersma <Matt.Boersma@microsoft.com>
Date: Wed, 5 Apr 2023 14:29:38 -0600
Subject: [PATCH] Pin Calico manifest at 1.7 (#191)

---
 src/capi/HISTORY.rst          |  6 ++++++
 src/capi/azext_capi/custom.py | 11 ++++++-----
 src/capi/setup.py             |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/capi/HISTORY.rst b/src/capi/HISTORY.rst
index b63119a..c1acd47 100644
--- a/src/capi/HISTORY.rst
+++ b/src/capi/HISTORY.rst
@@ -3,6 +3,12 @@
 Release History
 ===============
 
+0.1.4
++++++
+
+* Pin calico manifests at CAPZ release-1.7
+* Store AKS infra rg and vnet as environment variables
+
 0.1.3
 +++++
 
diff --git a/src/capi/azext_capi/custom.py b/src/capi/azext_capi/custom.py
index 9eb13fc..539b885 100644
--- a/src/capi/azext_capi/custom.py
+++ b/src/capi/azext_capi/custom.py
@@ -598,7 +598,7 @@ def install_cni(cmd, cluster_name, workload_cfg, windows, args):
             pass  # This is a best-effort configuration, so don't fail if we can't find the CIDR.
 
     # Install Calico CNI using the official Helm chart.
-    file_base = "https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main"
+    file_base = "https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/release-1.7"
     values_file = f"{file_base}/templates/addons/calico/values.yaml"
     if cidr0 and not cidr1:
         interface0 = ipaddress.ip_interface(cidr0)
@@ -614,7 +614,7 @@ def install_cni(cmd, cluster_name, workload_cfg, windows, args):
             values_file = f"{file_base}/templates/addons/calico-dual-stack/values.yaml"
     helminfo = HelmInfo(
         repo_name="projectcalico",
-        repo_url="https://projectcalico.docs.tigera.io/charts",
+        repo_url="https://docs.tigera.io/calico/charts",
         chart_name="calico",
         chart="projectcalico/tigera-operator",
         values_file=values_file,
@@ -639,12 +639,12 @@ def install_cni_windows(cmd, workload_cfg, msg):
     configmap = get_configmap(workload_cfg, "kubeadm-config", "kube-system")
     configmap = configmap.replace("namespace: kube-system", "namespace: calico-system")
     create_configmap(workload_cfg, configmap)
-    calico_manifest = "https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/addons/windows/calico/calico.yaml"  # pylint: disable=line-too-long
+    calico_manifest = "https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/release-1.7/templates/addons/windows/calico/calico.yaml"  # pylint: disable=line-too-long
     apply_kubernetes_manifest(cmd, calico_manifest, workload_cfg, msg)
 
 
 def install_windows_kubeproxy(cmd, args, workload_cfg, msg):
-    kubeproxy_manifest_url = "https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/addons/windows/calico/kube-proxy-windows.yaml"  # pylint: disable=line-too-long
+    kubeproxy_manifest_url = "https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/release-1.7/templates/addons/windows/calico/kube-proxy-windows.yaml"  # pylint: disable=line-too-long
     kubeproxy_manifest_file = "kube-proxy-windows.yaml"
     manifest = render_custom_cluster_template(kubeproxy_manifest_url, kubeproxy_manifest_file, args)
     write_to_file(kubeproxy_manifest_file, manifest)
@@ -728,7 +728,8 @@ def install_helm_chart(cmd, helminfo, workload_cfg, msg):
     begin_msg, end_msg, err_msg = message_variants(msg)
     attempts, delay = 100, 3
     with Spinner(cmd, begin_msg, end_msg):
-        command = ["helm", "repo", "add", helminfo.repo_name, helminfo.repo_url, "--kubeconfig", workload_cfg]
+        command = ["helm", "repo", "add", helminfo.repo_name, helminfo.repo_url,
+                   "--kubeconfig", workload_cfg, "--force-update"]
         try:
             retry_shell_command(command, attempts, delay)
         except subprocess.CalledProcessError as err:
diff --git a/src/capi/setup.py b/src/capi/setup.py
index d13ddce..c41f4a7 100644
--- a/src/capi/setup.py
+++ b/src/capi/setup.py
@@ -17,7 +17,7 @@
 
 # Confirm this is the right version number you want and it matches your
 # HISTORY.rst entry.
-VERSION = '0.1.3'
+VERSION = '0.1.4'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers