Skip to content

Commit

Permalink
Bump kubevirtci
Browse files Browse the repository at this point in the history
[ef6e700 Improve PodPreset enablement validation](kubevirt/kubevirtci#683)

Signed-off-by: kubevirt-bot <[email protected]>
  • Loading branch information
kubevirt-bot committed Oct 12, 2021
1 parent b7e9808 commit 15e79cf
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cluster-up-sha.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fe15566e713ea32e43dcc076a14df178371c1b12
d1933dec1f7e1b61324f3fbd6cc82c190e725e89
13 changes: 10 additions & 3 deletions cluster-up/cluster/kind/podpreset.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#!/usr/bin/env bash

set -e
set -ex

source ${KUBEVIRTCI_PATH}/cluster/kind/common.sh

VALIDATE_PODPRESET_TIMEOUT="60"
VALIDATE_PODPRESET_TIMEOUT="3m"
SYSTEM_CONTAINERS_READY_TIMEOUT="8m"

function podpreset::enable_admission_plugin() {
local -r cluster_name=$1
Expand All @@ -20,7 +21,7 @@ function podpreset::validate_admission_plugin_is_enabled() {
local -r wait_time=$2
local -r control_plane_container="$cluster_name-control-plane"

if ! timeout "${wait_time}s" bash <<EOT
if ! timeout "${wait_time}" bash <<EOT
function is_admission_plugin_enabled() {
docker top $control_plane_container |
grep -Po "kube-apiserver.*--enable-admission-plugins=.*\KPodPreset"
Expand All @@ -37,6 +38,11 @@ EOT
fi
}

function podpreset::wait_for_kube_system_components_ready() {
local -r timeout=$1
until _kubectl wait --for=condition=Ready pod --all -n kube-system --timeout "${timeout}"; do sleep 1 ;done
}

function podpreset::create_virt_launcher_fake_product_uuid_podpreset() {
local -r namespace=$1

Expand All @@ -53,5 +59,6 @@ function podpreset::expose_unique_product_uuid_per_node() {

podpreset::enable_admission_plugin "$cluster_name"
podpreset::validate_admission_plugin_is_enabled "$cluster_name" "$VALIDATE_PODPRESET_TIMEOUT"
podpreset::wait_for_kube_system_components_ready "$SYSTEM_CONTAINERS_READY_TIMEOUT"
podpreset::create_virt_launcher_fake_product_uuid_podpreset "$namespace"
}
2 changes: 1 addition & 1 deletion cluster-up/hack/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,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=2110051920-a63751a
KUBEVIRTCI_TAG=2110111047-ef6e700
2 changes: 1 addition & 1 deletion cluster-up/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2110051920-a63751a
2110111047-ef6e700
2 changes: 1 addition & 1 deletion hack/config-default.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cdi_namespace=cdi
image_pull_policy=${IMAGE_PULL_POLICY:-IfNotPresent}
verbosity=${VERBOSITY:-2}
package_name=${PACKAGE_NAME:-kubevirt-dev}
kubevirtci_git_hash="2110051920-a63751a"
kubevirtci_git_hash="2110111047-ef6e700"
conn_check_ipv4_address=${CONN_CHECK_IPV4_ADDRESS:-""}
conn_check_ipv6_address=${CONN_CHECK_IPV6_ADDRESS:-""}
conn_check_dns=${CONN_CHECK_DNS:-""}
Expand Down

0 comments on commit 15e79cf

Please sign in to comment.