From 34c05f84d17b65ab357cd2ef074c9ddae2d20eb8 Mon Sep 17 00:00:00 2001
From: Cecile Robert-Michon <cecilerobertm@gmail.com>
Date: Fri, 27 Jan 2023 22:40:55 +0000
Subject: [PATCH] Remove Calico felix override workaround

---
 Tiltfile                                    |  2 +-
 docs/book/src/topics/addons.md              |  3 ---
 scripts/ci-entrypoint.sh                    |  4 ----
 templates/addons/calico/felix-override.yaml |  8 --------
 test/e2e/cni.go                             | 10 ----------
 5 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 templates/addons/calico/felix-override.yaml

diff --git a/Tiltfile b/Tiltfile
index 05245778e4a..9a3abf869f4 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -363,7 +363,7 @@ def deploy_worker_templates(template, substitutions):
         calico_values = "./templates/addons/calico-dual-stack/values.yaml"
     else:
         calico_values = "./templates/addons/calico/values.yaml"
-    flavor_cmd += "; " + helm_cmd + " repo add projectcalico https://projectcalico.docs.tigera.io/charts; " + helm_cmd + " --kubeconfig ./${CLUSTER_NAME}.kubeconfig install calico projectcalico/tigera-operator -f " + calico_values + " --namespace tigera-operator --create-namespace; kubectl --kubeconfig ./${CLUSTER_NAME}.kubeconfig apply -f ./templates/addons/calico/felix-override.yaml"
+    flavor_cmd += "; " + helm_cmd + " repo add projectcalico https://projectcalico.docs.tigera.io/charts; " + helm_cmd + " --kubeconfig ./${CLUSTER_NAME}.kubeconfig install calico projectcalico/tigera-operator -f " + calico_values + " --namespace tigera-operator --create-namespace"
     if "external-cloud-provider" in flavor_name:
         flavor_cmd += "; " + helm_cmd + " --kubeconfig ./${CLUSTER_NAME}.kubeconfig install --repo https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo cloud-provider-azure --generate-name --set infra.clusterName=${CLUSTER_NAME}"
     local_resource(
diff --git a/docs/book/src/topics/addons.md b/docs/book/src/topics/addons.md
index 411b51887cb..97517d9ca3b 100644
--- a/docs/book/src/topics/addons.md
+++ b/docs/book/src/topics/addons.md
@@ -30,7 +30,6 @@ Then install the Helm chart on the workload cluster:
 ```bash
 helm repo add projectcalico https://projectcalico.docs.tigera.io/charts && \
 helm install calico projectcalico/tigera-operator -f https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/addons/calico/values.yaml --set-string "installation.calicoNetwork.ipPools[0].cidr=${IPV4_CIDR_BLOCK}" --namespace tigera-operator --create-namespace
-kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/addons/calico/felix-override.yaml
 ```
 
 ### For IPv6 Clusters
@@ -46,7 +45,6 @@ Then install the Helm chart on the workload cluster:
 ```bash
 helm repo add projectcalico https://projectcalico.docs.tigera.io/charts && \
 helm install calico projectcalico/tigera-operator -f https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/addons/calico-ipv6/values.yaml  --set-string "installation.calicoNetwork.ipPools[0].cidr=${IPV6_CIDR_BLOCK}" --namespace tigera-operator --create-namespace
-kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/addons/calico/felix-override.yaml
 ```
 
 ### For Dual-Stack Clusters
@@ -63,7 +61,6 @@ Then install the Helm chart on the workload cluster:
 ```bash
 helm repo add projectcalico https://projectcalico.docs.tigera.io/charts && \
 helm install calico projectcalico/tigera-operator -f https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/addons/calico-dual-stack/values.yaml --set-string "installation.calicoNetwork.ipPools[0].cidr=${IPV4_CIDR_BLOCK}","installation.calicoNetwork.ipPools[1].cidr=${IPV6_CIDR_BLOCK}" --namespace tigera-operator --create-namespace
-kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/main/templates/addons/calico/felix-override.yaml
 ```
 
 <aside class="note">
diff --git a/scripts/ci-entrypoint.sh b/scripts/ci-entrypoint.sh
index 9c2a3b763af..2abe08573f1 100755
--- a/scripts/ci-entrypoint.sh
+++ b/scripts/ci-entrypoint.sh
@@ -173,10 +173,6 @@ install_addons() {
     "${HELM}" repo add projectcalico https://projectcalico.docs.tigera.io/charts
     "${HELM}" install calico projectcalico/tigera-operator -f "${CALICO_VALUES_FILE}" --set-string "${CIDR_STRING_VALUES}" --namespace tigera-operator --create-namespace
 
-    # Add FeatureOverride for ChecksumOffloadBroken in FelixConfiguration.
-    # This is the recommended workaround for https://github.com/projectcalico/calico/issues/3145.
-    "${KUBECTL}" apply -f "${REPO_ROOT}"/templates/addons/calico/felix-override.yaml
-
     # install cloud-provider-azure components, if using out-of-tree
     if [[ -n "${TEST_CCM:-}" ]]; then
         CLOUD_CONFIG="/etc/kubernetes/azure.json"
diff --git a/templates/addons/calico/felix-override.yaml b/templates/addons/calico/felix-override.yaml
deleted file mode 100644
index 5652202b7cb..00000000000
--- a/templates/addons/calico/felix-override.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: crd.projectcalico.org/v1
-kind: FelixConfiguration
-metadata:
-  name: default
-spec:
-  # Add FeatureOverride for ChecksumOffloadBroken in FelixConfiguration.
-  # This is the recommended workaround for https://github.com/projectcalico/calico/issues/3145.
-  featureDetectOverride: "ChecksumOffloadBroken=true"
\ No newline at end of file
diff --git a/test/e2e/cni.go b/test/e2e/cni.go
index 503d7615f3c..1a60a783616 100644
--- a/test/e2e/cni.go
+++ b/test/e2e/cni.go
@@ -22,9 +22,7 @@ package e2e
 import (
 	"context"
 	"fmt"
-	"os"
 	"path/filepath"
-	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -63,14 +61,6 @@ func InstallCalicoHelmChart(ctx context.Context, input clusterctl.ApplyClusterTe
 		WaitForDeploymentsAvailable(ctx, waitInput, e2eConfig.GetIntervals(specName, "wait-deployment")...)
 	}
 
-	// Add FeatureOverride for ChecksumOffloadBroken in FelixConfiguration.
-	// This is the recommended workaround for https://github.com/projectcalico/calico/issues/3145.
-	felixYaml, err := os.ReadFile(filepath.Join(e2eConfig.GetVariable(AddonsPath), "calico", "felix-override.yaml"))
-	Expect(err).NotTo(HaveOccurred())
-	Eventually(func() error {
-		return clusterProxy.Apply(ctx, felixYaml)
-	}, 10*time.Second).Should(Succeed(), "Failed to apply the felix configurations patch")
-
 	By("Waiting for Ready calico-system deployment pods")
 	for _, d := range []string{"calico-kube-controllers", "calico-typha"} {
 		waitInput := GetWaitForDeploymentsAvailableInput(ctx, clusterProxy, d, CalicoSystemNamespace, specName)