Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Calico felix override workaround #3115

Merged
merged 1 commit into from
Jan 31, 2023
Merged

Remove Calico felix override workaround #3115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tiltfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
CecileRobertMichon marked this conversation as resolved.
Show resolved Hide resolved
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(
Expand Down
3 changes: 0 additions & 3 deletions docs/book/src/topics/addons.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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">
Expand Down
4 changes: 0 additions & 4 deletions scripts/ci-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 0 additions & 8 deletions templates/addons/calico/felix-override.yaml
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions test/e2e/cni.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ package e2e
import (
"context"
"fmt"
"os"
"path/filepath"
"time"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down Expand Up @@ -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)
Expand Down