Skip to content

Commit 9939227

Browse files
committed
Removing calico - using default CNI from Kind
1 parent b5902cb commit 9939227

File tree

4 files changed

+2
-17
lines changed

4 files changed

+2
-17
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,8 @@ To manually setup run:
8080
```shell
8181
# To generate an Kubebuilder local binary with your changes
8282
make install
83-
# To create the cluster and configure a CNI which supports NetworkPolicy
83+
# To create the cluster
8484
kind create cluster --config ./test/e2e/kind-config.yaml
85-
kubectl apply -f https://docs.projectcalico.org/manifests/calico.yaml
8685
```
8786

8887
Now, you can for example, run in debug mode the `test/e2e/v4/e2e_suite_test.go`:

test/e2e/kind-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
kind: Cluster
1616
apiVersion: kind.x-k8s.io/v1alpha4
1717
networking:
18-
disableDefaultCNI: true # Disable the default CNI so that we can test NetworkPolicies
18+
disableDefaultCNI: false # Let it use default CNI so we can test NetworkPolicies
1919
nodes:
2020
- role: control-plane

test/e2e/setup.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ function create_cluster {
3939
fi
4040
echo "Creating cluster..."
4141
kind create cluster -v 4 --name $KIND_CLUSTER --retain --wait=1m --config ${kind_config} --image=kindest/node:$1
42-
echo "Installing Calico..."
43-
kubectl apply -f https://docs.projectcalico.org/manifests/calico.yaml
4442
fi
4543
}
4644

test/e2e/v4/plugin_cluster_test.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -207,18 +207,6 @@ func Run(kbc *utils.TestContext, hasWebhook, isToUseInstaller, isToUseHelmChart,
207207
Expect(err).NotTo(HaveOccurred())
208208

209209
if hasNetworkPolicies {
210-
By("Checking for Calico pods")
211-
var outputGet string
212-
outputGet, err = kbc.Kubectl.Get(
213-
false,
214-
"pods",
215-
"-n", "kube-system",
216-
"-l", "k8s-app=calico-node",
217-
"-o", "jsonpath={.items[*].status.phase}",
218-
)
219-
Expect(err).NotTo(HaveOccurred(), "Failed to get Calico pods")
220-
Expect(outputGet).To(ContainSubstring("Running"), "All Calico pods should be in Running state")
221-
222210
if hasMetrics {
223211
By("labeling the namespace to allow consume the metrics")
224212
Expect(kbc.Kubectl.Command("label", "namespaces", kbc.Kubectl.Namespace,

0 commit comments

Comments
 (0)