From 730e1aa548e9e954511cbe76f8bc4924c682cc9e Mon Sep 17 00:00:00 2001 From: Or Shoval Date: Tue, 10 Mar 2026 16:34:41 +0200 Subject: [PATCH] cluster: Fix kubevirtci clone storm cluster::install checks whether the existing kubevirtci clone matches the requested one by comparing both the remote URL and the tag. The remote URL check fails when the clone was done via SSH (git@github.com:...) because the stored KUBEVIRTCI_REPO uses HTTPS (https://github.com/...). The mismatch causes kubevirtci to be deleted and re-cloned on every invocation, wiping the cluster kubeconfig and breaking the dev workflow. Remove the remote URL check and keep only the tag comparison. Drop the now-unused KUBEVIRTCI_REPO variable. Derived from: https://github.com/kubevirt/cluster-network-addons-operator/pull/2619 Assisted-by: Cursor (claude-4.6-sonnet-medium-thinking) Signed-off-by: Or Shoval --- cluster/cluster.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/cluster/cluster.sh b/cluster/cluster.sh index 608d8a4..d1151c8 100755 --- a/cluster/cluster.sh +++ b/cluster/cluster.sh @@ -15,22 +15,16 @@ export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-'k8s-1.34'} export KUBEVIRTCI_TAG=${KUBEVIRTCI_TAG:-2509181951-8264c60a} -KUBEVIRTCI_REPO='https://github.com/kubevirt/kubevirtci.git' # The CLUSTER_PATH var is used in cluster folder and points to the _kubevirtci where the cluster is deployed from. CLUSTER_PATH=${CLUSTER_PATH:-"${PWD}/_kubevirtci/"} -function cluster::_get_repo() { - git --git-dir ${CLUSTER_PATH}/.git remote get-url origin -} - function cluster::_get_tag() { git --git-dir ${CLUSTER_PATH}/.git describe --tags } function cluster::install() { - # Remove cloned kubevirtci repository if it does not match the requested one if [ -d ${CLUSTER_PATH} ]; then - if [ $(cluster::_get_repo) != ${KUBEVIRTCI_REPO} -o $(cluster::_get_tag) != ${KUBEVIRTCI_TAG} ]; then + if [[ $(cluster::_get_tag) != ${KUBEVIRTCI_TAG} ]]; then rm -rf ${CLUSTER_PATH} fi fi