From 2e2dd9eaacbe6ffa467f66689644dfe468600dc7 Mon Sep 17 00:00:00 2001
From: Jenny Shu <28537278+jenshu@users.noreply.github.com>
Date: Thu, 30 Jan 2025 10:05:41 -0500
Subject: [PATCH] remove cilium from setup-kind script (#10551)

---
 ci/kind/cluster.yaml  |  4 ----
 ci/kind/setup-kind.sh | 13 -------------
 2 files changed, 17 deletions(-)

diff --git a/ci/kind/cluster.yaml b/ci/kind/cluster.yaml
index abe8e649aba..1b48be705f0 100644
--- a/ci/kind/cluster.yaml
+++ b/ci/kind/cluster.yaml
@@ -1,9 +1,5 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
-# Do not use the default CNI as kindnet does not support custom network policies.
-# Instead, cilium is installed as CNI as we need to test Kube API server unavailability in the kube2e tests
-networking:
-  disableDefaultCNI: true
 kubeadmConfigPatches:
   - |
     apiVersion: kubeadm.k8s.io/v1beta3
diff --git a/ci/kind/setup-kind.sh b/ci/kind/setup-kind.sh
index f4a969dda5c..f669f9580ed 100755
--- a/ci/kind/setup-kind.sh
+++ b/ci/kind/setup-kind.sh
@@ -21,8 +21,6 @@ CONFORMANCE="${CONFORMANCE:-false}"
 CONFORMANCE_VERSION="${CONFORMANCE_VERSION:-v1.2.0}"
 # The channel of the k8s gateway api conformance tests to run. Requires CONFORMANCE=true
 CONFORMANCE_CHANNEL="${CONFORMANCE_CHANNEL:-"experimental"}"
-# The version of Cilium to install.
-CILIUM_VERSION="${CILIUM_VERSION:-1.15.5}"
 
 function create_kind_cluster_or_skip() {
   activeClusters=$(kind get clusters)
@@ -38,17 +36,6 @@ function create_kind_cluster_or_skip() {
     --name "$CLUSTER_NAME" \
     --image "kindest/node:$CLUSTER_NODE_VERSION" \
     --config="$SCRIPT_DIR/cluster.yaml"
-
-  # Install cilium as we need to define custom network policies to simulate kube api server unavailability
-  # in some of our kube2e tests
-  helm repo add cilium-setup-kind https://helm.cilium.io/
-  helm repo update
-  helm install cilium cilium-setup-kind/cilium --version $CILIUM_VERSION \
-   --namespace kube-system \
-   --set image.pullPolicy=IfNotPresent \
-   --set ipam.mode=kubernetes \
-   --set operator.replicas=1
-  helm repo remove cilium-setup-kind
   echo "Finished setting up cluster $CLUSTER_NAME"
 
   # so that you can just build the kind image alone if needed