Bump kubevirtci

[6c7e367 cluster-up, kind: all to exec command via ssh.sh and add port mapping for kind cluster](kubevirt/kubevirtci#1344) ```release-note NONE ``` Signed-off-by: kubevirt-bot <[email protected]>
kubevirt-bot · Jan 10, 2025 · aad0cd3 · aad0cd3
1 parent a74baa2
commit aad0cd3
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 5 deletions.
diff --git a/hack/config-default.sh b/hack/config-default.sh
@@ -36,7 +36,7 @@ cdi_namespace=cdi
 image_pull_policy=${IMAGE_PULL_POLICY:-IfNotPresent}
 verbosity=${VERBOSITY:-2}
 package_name=${PACKAGE_NAME:-kubevirt-dev}
-kubevirtci_git_hash="2412171619-fbd31717"
+kubevirtci_git_hash="2501090845-6c7e367a"
 conn_check_ipv4_address=${CONN_CHECK_IPV4_ADDRESS:-""}
 conn_check_ipv6_address=${CONN_CHECK_IPV6_ADDRESS:-""}
 conn_check_dns=${CONN_CHECK_DNS:-""}

diff --git a/kubevirtci/cluster-up-sha.txt b/kubevirtci/cluster-up-sha.txt
@@ -1 +1 @@
-c8e41b0449bf6b53024d0f1b6eb4f07a7795e9ee
+95404330afc90d67241ff6b714b1cd77db3120b7
diff --git a/kubevirtci/cluster-up/cluster/kind-1.28/provider.sh b/kubevirtci/cluster-up/cluster/kind-1.28/provider.sh
@@ -37,6 +37,7 @@ function up() {
     cp $KIND_MANIFESTS_DIR/kind.yaml ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml
     _add_kubeadm_cpu_manager_config_patch
     _add_extra_mounts
+    _add_extra_portmapping
     export CONFIG_WORKER_CPU_MANAGER=true
     kind_up
 

diff --git a/kubevirtci/cluster-up/cluster/kind-1.31/provider.sh b/kubevirtci/cluster-up/cluster/kind-1.31/provider.sh
@@ -37,6 +37,7 @@ function up() {
     cp $KIND_MANIFESTS_DIR/kind.yaml ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml
     _add_kubeadm_cpu_manager_config_patch
     _add_extra_mounts
+    _add_extra_portmapping
     export CONFIG_WORKER_CPU_MANAGER=true
     kind_up
 

diff --git a/kubevirtci/cluster-up/cluster/kind/common.sh b/kubevirtci/cluster-up/cluster/kind/common.sh
@@ -12,6 +12,11 @@ CONFIG_WORKER_CPU_MANAGER=${CONFIG_WORKER_CPU_MANAGER:-false}
 # avaliable value: ipv4, ipv6, dual
 IPFAMILY=${IPFAMILY}
 
+# setup the port mapping for kind cluster, this is needed for some e2e tests
+# KIND_PORT_MAPPING=cluster_port:host_port e.g. KIND_PORT_MAPPING=30001:30002
+# only one port mapping allowed
+KIND_PORT_MAPPING=${KIND_PORT_MAPPING}
+
 # check CPU arch
 PLATFORM=$(uname -m)
 case ${PLATFORM} in
@@ -93,7 +98,11 @@ function _insecure-registry-config-cmd() {
 
 # this works since the nodes use the same names as containers
 function _ssh_into_node() {
-    ${CRI_BIN} exec -it "$1" bash
+    if [[ $2 != "" ]]; then
+        ${CRI_BIN} exec "$@"
+    else
+        ${CRI_BIN} exec -it "$1" bash
+    fi    
 }
 
 function _run_registry() {
@@ -259,6 +268,22 @@ EOF
   fi
 }
 
+function _add_extra_portmapping() {
+  if [[ "$KIND_PORT_MAPPING" != "" ]]; then
+    container_port=$(echo "$KIND_PORT_MAPPING" | awk -F: '{print $1}')
+    host_port=$(echo "$KIND_PORT_MAPPING" | awk -F: '{print $2}')
+    if [[ -z "$container_port" || -z "$host_port" ]]; then
+      echo "Invalid KIND_PORT_MAPPING format. Expected 'container_port:host_port'."
+      exit 1
+    fi
+    cat <<EOF >> ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml
+  extraPortMappings:
+  - containerPort: $container_port
+    hostPort: $host_port
+EOF
+  fi
+}
+
 function _add_kubeadm_cpu_manager_config_patch() {
     cat << EOF >> ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/kind.yaml
   kubeadmConfigPatches:

diff --git a/kubevirtci/cluster-up/hack/common.sh b/kubevirtci/cluster-up/hack/common.sh
@@ -55,4 +55,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=2412171619-fbd31717
+KUBEVIRTCI_TAG=2501090845-6c7e367a
diff --git a/kubevirtci/cluster-up/version.txt b/kubevirtci/cluster-up/version.txt
@@ -1 +1 @@
-2412171619-fbd31717
+2501090845-6c7e367a
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		c8e41b0449bf6b53024d0f1b6eb4f07a7795e9ee
		95404330afc90d67241ff6b714b1cd77db3120b7