Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump kubevirtci #11575

Merged
merged 1 commit into from Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cluster-up-sha.txt
@@ -1 +1 @@
c542b7fd77844648226ac45f5de3fb181f855f57
5b7ef1664cf77683bec60801843ee7e58f8c3b4d
24 changes: 23 additions & 1 deletion cluster-up/cluster/k8s-provider-common.sh
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cluster-up/cluster/kind/common.sh
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion cluster-up/hack/common.sh
Expand Up @@ -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}
Expand All @@ -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
2 changes: 1 addition & 1 deletion cluster-up/version.txt
@@ -1 +1 @@
2403190834-f47f81b
2404201104-8f203b9
2 changes: 1 addition & 1 deletion hack/config-default.sh
Expand Up @@ -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:-""}
Expand Down