From 1e06a7604353e44086ab3ccd292a36f2b8eb5ea2 Mon Sep 17 00:00:00 2001 From: kubevirt-bot Date: Tue, 23 Apr 2024 13:12:21 +0000 Subject: [PATCH] Bump kubevirtci [8f203b9 Automatic bump of CentOS Stream to latest](https://github.com/kubevirt/kubevirtci/pull/1181) [5d854e0 centos9: Add --numa support to vm.sh](https://github.com/kubevirt/kubevirtci/pull/1174) [73b90a3 Run bazelisk run //robots/cmd/kubevirtci-bumper:kubevirtci-bumper -- -ensure-last-three-minor-of v1 --k8s-provider-dir /home/prow/go/src/github.com/kubevirt/project-infra/../kubevirtci/cluster-provision/k8s](https://github.com/kubevirt/kubevirtci/pull/1175) [1c58677 Remove NoSchedule taints for control-planes as well as masters](https://github.com/kubevirt/kubevirtci/pull/1173) [9d50baf Automatic bump of CentOS Stream to latest](https://github.com/kubevirt/kubevirtci/pull/1168) [ef69592 Bump alpine to 3.19](https://github.com/kubevirt/kubevirtci/pull/1167) [4c6d7c7 Add AAQ Operator as an optional cluster addon](https://github.com/kubevirt/kubevirtci/pull/1170) [d69cd4e Automatic bump of CentOS Stream to latest](https://github.com/kubevirt/kubevirtci/pull/1166) [62457f2 Automatic bump of CentOS Stream to latest](https://github.com/kubevirt/kubevirtci/pull/1162) [85d8a72 centos: Update centos stream base to 20240318.0](https://github.com/kubevirt/kubevirtci/pull/1161) [970d172 Bump github.com/docker/docker in /cluster-provision/gocli](https://github.com/kubevirt/kubevirtci/pull/1159) ```release-note NONE ``` Signed-off-by: kubevirt-bot --- cluster-up-sha.txt | 2 +- cluster-up/cluster/k8s-provider-common.sh | 24 ++++++++++++++++++++++- cluster-up/cluster/kind/common.sh | 2 +- cluster-up/hack/common.sh | 4 +++- cluster-up/version.txt | 2 +- hack/config-default.sh | 2 +- 6 files changed, 30 insertions(+), 6 deletions(-) diff --git a/cluster-up-sha.txt b/cluster-up-sha.txt index 6d6a15a4699d..7912fdef1de2 100644 --- a/cluster-up-sha.txt +++ b/cluster-up-sha.txt @@ -1 +1 @@ -c542b7fd77844648226ac45f5de3fb181f855f57 +5b7ef1664cf77683bec60801843ee7e58f8c3b4d diff --git a/cluster-up/cluster/k8s-provider-common.sh b/cluster-up/cluster/k8s-provider-common.sh index c70a4bf8d920..c5a6925dc527 100644 --- a/cluster-up/cluster/k8s-provider-common.sh +++ b/cluster-up/cluster/k8s-provider-common.sh @@ -166,6 +166,27 @@ function configure_prometheus() { fi } +function deploy_aaq() { + if [ "$KUBEVIRT_DEPLOY_AAQ" == "true" ]; then + if [ -n "${KUBEVIRT_CUSTOM_AAQ_VERSION}" ]; then + $ssh node01 -- 'sudo sed --regexp-extended -i s/v[0-9]+\.[0-9]+\.[0-9]+\(.*\)?$/'"$KUBEVIRT_CUSTOM_AAQ_VERSION"'/g /opt/aaq/aaq-*-operator.yaml' + fi + + $kubectl create -f /opt/aaq/aaq-*-operator.yaml + $kubectl create -f /opt/aaq/aaq-*-cr.yaml + fi +} + +function wait_for_aaq_ready() { + if [ "$KUBEVIRT_DEPLOY_AAQ" == "true" ]; then + while [ "$($kubectl get pods --namespace aaq | grep -c 'aaq-')" -lt 4 ]; do + $kubectl get pods --namespace aaq + sleep 10 + done + $kubectl wait --for=condition=Ready pod --timeout=180s --all --namespace aaq + fi +} + function up() { params=$(_add_common_params) if echo "$params" | grep -q ERROR; then @@ -212,8 +233,9 @@ function up() { deploy_multus deploy_istio deploy_cdi + deploy_aaq - until wait_for_cnao_ready && wait_for_istio_ready && wait_for_cdi_ready && wait_for_multus_ready; do + until wait_for_cnao_ready && wait_for_istio_ready && wait_for_cdi_ready && wait_for_multus_ready && wait_for_aaq_ready; do echo "Waiting for cluster components..." sleep 5 done diff --git a/cluster-up/cluster/kind/common.sh b/cluster-up/cluster/kind/common.sh index 36424dc5a47d..6ae35b3efd30 100755 --- a/cluster-up/cluster/kind/common.sh +++ b/cluster-up/cluster/kind/common.sh @@ -171,7 +171,7 @@ function _fix_node_labels() { master_nodes=$(_get_nodes | grep -i $MASTER_NODES_PATTERN | awk '{print $1}') for node in ${master_nodes[@]}; do # removing NoSchedule taint if is there - if _kubectl taint nodes $node node-role.kubernetes.io/master:NoSchedule-; then + if _kubectl taint nodes $node node-role.kubernetes.io/master:NoSchedule- || _kubectl taint nodes $node node-role.kubernetes.io/control-plane:NoSchedule-; then _kubectl label node $node kubevirt.io/schedulable=true fi done diff --git a/cluster-up/hack/common.sh b/cluster-up/hack/common.sh index d640ac19d398..bbce33aefc06 100644 --- a/cluster-up/hack/common.sh +++ b/cluster-up/hack/common.sh @@ -31,6 +31,8 @@ KUBEVIRT_DEPLOY_PROMETHEUS_ALERTMANAGER=${KUBEVIRT_DEPLOY_PROMETHEUS_ALERTMANAGE KUBEVIRT_DEPLOY_GRAFANA=${KUBEVIRT_DEPLOY_GRAFANA:-false} KUBEVIRT_CGROUPV2=${KUBEVIRT_CGROUPV2:-false} KUBEVIRT_DEPLOY_CDI=${KUBEVIRT_DEPLOY_CDI:-false} +KUBEVIRT_DEPLOY_AAQ=${KUBEVIRT_DEPLOY_AAQ:-false} +KUBEVIRT_CUSTOM_AAQ_VERSION=${KUBEVIRT_CUSTOM_AAQ_VERSION} KUBEVIRT_CUSTOM_CDI_VERSION=${KUBEVIRT_CUSTOM_CDI_VERSION} KUBEVIRT_SWAP_ON=${KUBEVIRT_SWAP_ON:-false} KUBEVIRT_KSM_ON=${KUBEVIRT_KSM_ON:-false} @@ -48,4 +50,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=2403190834-f47f81b +KUBEVIRTCI_TAG=2404201104-8f203b9 diff --git a/cluster-up/version.txt b/cluster-up/version.txt index bc100f872ff2..9de7068add48 100644 --- a/cluster-up/version.txt +++ b/cluster-up/version.txt @@ -1 +1 @@ -2403190834-f47f81b +2404201104-8f203b9 diff --git a/hack/config-default.sh b/hack/config-default.sh index ac3dc531a7ea..33d91226a714 100644 --- a/hack/config-default.sh +++ b/hack/config-default.sh @@ -37,7 +37,7 @@ cdi_namespace=cdi image_pull_policy=${IMAGE_PULL_POLICY:-IfNotPresent} verbosity=${VERBOSITY:-2} package_name=${PACKAGE_NAME:-kubevirt-dev} -kubevirtci_git_hash="2403190834-f47f81b" +kubevirtci_git_hash="2404201104-8f203b9" conn_check_ipv4_address=${CONN_CHECK_IPV4_ADDRESS:-""} conn_check_ipv6_address=${CONN_CHECK_IPV6_ADDRESS:-""} conn_check_dns=${CONN_CHECK_DNS:-""}