Skip to content

Commit

Permalink
remove cilium from setup-kind script (#10551)
Browse files Browse the repository at this point in the history
  • Loading branch information
jenshu authored Jan 30, 2025
1 parent ca9b260 commit 2e2dd9e
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 17 deletions.
4 changes: 0 additions & 4 deletions ci/kind/cluster.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
13 changes: 0 additions & 13 deletions ci/kind/setup-kind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down

0 comments on commit 2e2dd9e

Please sign in to comment.