Skip to content

🌱 Removing calico - using default CNI from Kind #4791

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

Merged
merged 1 commit into from
May 5, 2025
Merged

🌱 Removing calico - using default CNI from Kind #4791

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
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,8 @@ To manually setup run:
```shell
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @irapandey

Thank you a lot for your contribution 🥇
Could you please ensure that this PR is rebased with master so we can get it merged?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please squash the commits for we get this one merged?
Ideally we should have 1 commit per PR

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done ✅

# To generate an Kubebuilder local binary with your changes
make install
# To create the cluster and configure a CNI which supports NetworkPolicy
# To create the cluster
kind create cluster --config ./test/e2e/kind-config.yaml
kubectl apply -f https://docs.projectcalico.org/manifests/calico.yaml
```

Now, you can for example, run in debug mode the `test/e2e/v4/e2e_suite_test.go`:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/kind-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
networking:
disableDefaultCNI: true # Disable the default CNI so that we can test NetworkPolicies
disableDefaultCNI: false # Let it use default CNI so we can test NetworkPolicies
nodes:
- role: control-plane
2 changes: 0 additions & 2 deletions test/e2e/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ function create_cluster {
fi
echo "Creating cluster..."
kind create cluster -v 4 --name $KIND_CLUSTER --retain --wait=1m --config ${kind_config} --image=kindest/node:$1
echo "Installing Calico..."
kubectl apply -f https://docs.projectcalico.org/manifests/calico.yaml
fi
}

Expand Down
12 changes: 0 additions & 12 deletions test/e2e/v4/plugin_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,18 +207,6 @@ func Run(kbc *utils.TestContext, hasWebhook, isToUseInstaller, isToUseHelmChart,
Expect(err).NotTo(HaveOccurred())

if hasNetworkPolicies {
By("Checking for Calico pods")
var outputGet string
outputGet, err = kbc.Kubectl.Get(
false,
"pods",
"-n", "kube-system",
"-l", "k8s-app=calico-node",
"-o", "jsonpath={.items[*].status.phase}",
)
Expect(err).NotTo(HaveOccurred(), "Failed to get Calico pods")
Expect(outputGet).To(ContainSubstring("Running"), "All Calico pods should be in Running state")

if hasMetrics {
By("labeling the namespace to allow consume the metrics")
Expect(kbc.Kubectl.Command("label", "namespaces", kbc.Kubectl.Namespace,
Expand Down