Skip to content

Commit

Permalink
Update kubevirtci due to a bug in last version
Browse files Browse the repository at this point in the history
Signed-off-by: Shelly Kagan <skagan@redhat.com>
  • Loading branch information
ShellyKa13 committed Jan 16, 2024
1 parent d3455d0 commit 9220bba
Show file tree
Hide file tree
Showing 15 changed files with 530 additions and 257 deletions.
20 changes: 19 additions & 1 deletion cluster-up/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
# How to use cluster-up
# cluster-up

## Prerequisites: podman or docker

cluster-up requires that either podman or docker be installed on the host.

If podman is being used, it is also necessary to enable podman socket with:

```
sudo systemctl enable podman.socket
sudo systemctl start podman.socket
```

for more information see:

https://github.com/kubevirt/kubevirtci/blob/main/PODMAN.md


## How to use cluster-up

This directory provides a wrapper around gocli. It can be vendored into other
git repos and integrated to provide in the kubevirt well-known cluster commands
Expand Down
File renamed without changes.
45 changes: 0 additions & 45 deletions cluster-up/cluster/kind-1.23/README.md

This file was deleted.

51 changes: 0 additions & 51 deletions cluster-up/cluster/kind-1.23/provider.sh

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

DEFAULT_CLUSTER_NAME="kind-1.27"
DEFAULT_CLUSTER_NAME="kind-1.28"
DEFAULT_HOST_PORT=5000
ALTERNATE_HOST_PORT=5001
export CLUSTER_NAME=${CLUSTER_NAME:-$DEFAULT_CLUSTER_NAME}
Expand All @@ -14,8 +14,8 @@ else
fi

function set_kind_params() {
export KIND_VERSION="${KIND_VERSION:-0.19.0}"
export KIND_NODE_IMAGE="${KIND_NODE_IMAGE:-kindest/node:v1.27.1@sha256:b7d12ed662b873bd8510879c1846e87c7e676a79fefc93e17b2a52989d3ff42b}"
export KIND_VERSION="${KIND_VERSION:-0.20.0}"
export KIND_NODE_IMAGE="${KIND_NODE_IMAGE:-kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31}"
export KUBECTL_PATH="${KUBECTL_PATH:-/usr/bin/kubectl}"
}

Expand Down
15 changes: 14 additions & 1 deletion cluster-up/cluster/kind/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ function detect_cri() {

export CRI_BIN=${CRI_BIN:-$(detect_cri)}
CONFIG_WORKER_CPU_MANAGER=${CONFIG_WORKER_CPU_MANAGER:-false}
# only setup ipFamily when the environmental variable is not empty
# avaliable value: ipv4, ipv6, dual
IPFAMILY=${IPFAMILY}

# check CPU arch
PLATFORM=$(uname -m)
Expand Down Expand Up @@ -286,10 +289,20 @@ EOF
fi
}

function _setup_ipfamily() {
if [ $IPFAMILY != "" ]; then
cat <<EOF >> ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml
networking:
ipFamily: $IPFAMILY
EOF
echo "KIND cluster ip family has been set to $IPFAMILY"
fi
}

function _prepare_kind_config() {
_add_workers
_add_kubeadm_config_patches

_setup_ipfamily
echo "Final KIND config:"
cat ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml
}
Expand Down
98 changes: 0 additions & 98 deletions cluster-up/cluster/local/README.md

This file was deleted.

56 changes: 0 additions & 56 deletions cluster-up/cluster/local/provider.sh

This file was deleted.

4 changes: 2 additions & 2 deletions cluster-up/hack/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fi


KUBEVIRTCI_CLUSTER_PATH=${KUBEVIRTCI_CLUSTER_PATH:-${KUBEVIRTCI_PATH}/cluster}
KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-k8s-1.25}
KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-k8s-1.27}
KUBEVIRT_NUM_NODES=${KUBEVIRT_NUM_NODES:-1}
KUBEVIRT_MEMORY_SIZE=${KUBEVIRT_MEMORY_SIZE:-5120M}
KUBEVIRT_NUM_SECONDARY_NICS=${KUBEVIRT_NUM_SECONDARY_NICS:-0}
Expand Down Expand Up @@ -48,4 +48,4 @@ provider_prefix=${JOB_NAME:-${KUBEVIRT_PROVIDER}}${EXECUTOR_NUMBER}
job_prefix=${JOB_NAME:-kubevirt}${EXECUTOR_NUMBER}

mkdir -p $KUBEVIRTCI_CONFIG_PATH/$KUBEVIRT_PROVIDER
KUBEVIRTCI_TAG=2309040711-7a80619
KUBEVIRTCI_TAG=2309141019-029e67a
Loading

0 comments on commit 9220bba

Please sign in to comment.