kubevirt · aerosouund · Nov 26, 2024 · Nov 28, 2024 · Nov 28, 2024 · Nov 29, 2024
diff --git a/cluster-provision/gocli/opts/istio/istio.go b/cluster-provision/gocli/opts/istio/istio.go
@@ -2,14 +2,8 @@ package istio
 
 import (
 	_ "embed"
-	"fmt"
-	"time"
 
-	"github.com/cenkalti/backoff/v4"
 	"github.com/sirupsen/logrus"
-	istiov1alpha1 "istio.io/operator/pkg/apis/istio/v1alpha1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	k8s "kubevirt.io/kubevirtci/cluster-provision/gocli/pkg/k8s"
 	"kubevirt.io/kubevirtci/cluster-provision/gocli/pkg/libssh"
 )
@@ -23,7 +17,7 @@ var istioWithCnao []byte
 //go:embed manifests/istio-operator.cr.yaml
 var istioNoCnao []byte
 
-const istioVersion = "1.15.0"
+const istioVersion = "1.23.1"
 
 type istioOpt struct {
 	cnaoEnabled bool
@@ -49,72 +43,27 @@ func (o *istioOpt) Exec() error {
 		return err
 	}
 
+	istioFile := "/opt/istio-operator-with-cnao.yaml"
+	if !o.cnaoEnabled {
+		istioFile = "/opt/istio-operator.cr.yaml"
+	}
+
 	cmds := []string{
 		"source /var/lib/kubevirtci/shared_vars.sh",
-		"PATH=/opt/istio-" + istioVersion + "/bin:$PATH istioctl --kubeconfig /etc/kubernetes/admin.conf --hub quay.io/kubevirtci operator init",
+		`echo '` + string(istioWithCnao) + `' |  tee /opt/istio-operator-with-cnao.yaml > /dev/null`,
+		`echo '` + string(istioNoCnao) + `' |  tee /opt/istio-operator.cr.yaml > /dev/null`,
 	}
 	for _, cmd := range cmds {
 		if err := o.sshClient.Command(cmd); err != nil {
 			return err
 		}
 	}
 
-	obj, err = k8s.SerializeIntoObject(istioWithCnao)
-	if err != nil {
+	istioInstallCmd := "PATH=/opt/istio-" + istioVersion + "/bin:$PATH istioctl --kubeconfig /etc/kubernetes/admin.conf install -y -f " + istioFile
+	if err := o.sshClient.Command(istioInstallCmd); err != nil {
 		return err
 	}
 
-	if o.cnaoEnabled {
-		if err := o.client.Apply(obj); err != nil {
-			return err
-		}
-	} else {
-		obj, err = k8s.SerializeIntoObject(istioNoCnao)
-		if err != nil {
-			return err
-		}
-
-		if err := o.client.Apply(obj); err != nil {
-			return err
-		}
-	}
-
-	operator := &istiov1alpha1.IstioOperator{}
-
-	operation := func() error {
-		obj, err := o.client.Get(schema.GroupVersionKind{Group: "install.istio.io",
-			Version: "v1alpha1",
-			Kind:    "IstioOperator"}, "istio-operator", "istio-system")
-
-		err = runtime.DefaultUnstructuredConverter.FromUnstructured(obj.Object, operator)
-		if err != nil {
-			return err
-		}
-
-		if operator.Status == nil {
-			err := fmt.Errorf("Operator status is still not ready")
-			logrus.Info("Istio operator is still not ready, Backing off and retrying")
-			return err
-		}
-
-		if operator.Status.Status != 3 {
-			err := fmt.Errorf("Istio operator failed to move to Healthy status after max retries")
-			logrus.Info("Istio operator is still not ready, Backing off and retrying")
-			return err
-		}
-
-		return nil
-	}
-
-	backoffStrategy := backoff.NewExponentialBackOff()
-	backoffStrategy.InitialInterval = 10 * time.Second
-	backoffStrategy.MaxElapsedTime = 3 * time.Minute
-
-	err = backoff.Retry(operation, backoffStrategy)
-	if err != nil {
-		return fmt.Errorf("Waiting on istio operator to become ready failed after maximum retries: %v", err)
-	}
-
 	logrus.Info("Istio operator is now ready!")
 	return nil
 }
diff --git a/cluster-provision/gocli/opts/istio/istio_test.go b/cluster-provision/gocli/opts/istio/istio_test.go
@@ -26,8 +26,7 @@ var _ = Describe("IstioOpt", func() {
 	BeforeEach(func() {
 		mockCtrl = gomock.NewController(GinkgoT())
 		sshClient = kubevirtcimocks.NewMockSSHClient(mockCtrl)
-		r := k8s.NewReactorConfig("create", "istiooperators", IstioReactor)
-		k8sclient = k8s.NewTestClient(r)
+		k8sclient = k8s.NewTestClient()
 		opt = NewIstioOpt(sshClient, k8sclient, false)
 		AddExpectCalls(sshClient)
 	})

diff --git a/cluster-provision/gocli/opts/istio/manifests/istio-operator-with-cnao.cr.yaml b/cluster-provision/gocli/opts/istio/manifests/istio-operator-with-cnao.cr.yaml
@@ -5,7 +5,6 @@ metadata:
   name: istio-operator
 spec:
   profile: demo
-  hub: quay.io/kubevirtci
   components:
     cni:
       enabled: true
@@ -22,3 +21,10 @@ spec:
        - istio-system
        - kube-system
       logLevel: debug
+    pilot:
+      cni:
+        enabled: true
+        provider: "multus"
+    sidecarInjectorWebhook:
+      injectedAnnotations:
+        k8s.v1.cni.cncf.io/networks: istio-cni
diff --git a/cluster-provision/gocli/opts/istio/manifests/istio-operator.cr.yaml b/cluster-provision/gocli/opts/istio/manifests/istio-operator.cr.yaml
@@ -5,7 +5,6 @@ metadata:
   name: istio-operator
 spec:
   profile: demo
-  hub: quay.io/kubevirtci
   components:
     cni:
       enabled: true

diff --git a/cluster-provision/gocli/opts/istio/testconfig.go b/cluster-provision/gocli/opts/istio/testconfig.go
@@ -22,7 +22,9 @@ var IstioReactor = func(action k8stesting.Action) (bool, runtime.Object, error)
 func AddExpectCalls(sshClient *kubevirtcimocks.MockSSHClient) {
 	cmds := []string{
 		"source /var/lib/kubevirtci/shared_vars.sh",
-		"PATH=/opt/istio-1.15.0/bin:$PATH istioctl --kubeconfig /etc/kubernetes/admin.conf --hub quay.io/kubevirtci operator init",
+		`echo '` + string(istioWithCnao) + `' |  tee /opt/istio-operator-with-cnao.yaml > /dev/null`,
+		`echo '` + string(istioNoCnao) + `' |  tee /opt/istio-operator.cr.yaml > /dev/null`,
+		"PATH=/opt/istio-" + istioVersion + "/bin:$PATH istioctl --kubeconfig /etc/kubernetes/admin.conf install -y -f /opt/istio-operator.cr.yaml",
 	}
 
 	for _, cmd := range cmds {

diff --git a/cluster-provision/gocli/pkg/k8s/k8s.go b/cluster-provision/gocli/pkg/k8s/k8s.go
@@ -3,6 +3,7 @@ package utils
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
@@ -16,6 +17,7 @@ import (
 	cdiv1beta1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
 
 	"github.com/cenkalti/backoff/v4"
+	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -39,6 +41,7 @@ type K8sDynamicClient interface {
 	Apply(obj *unstructured.Unstructured) error
 	List(gvk schema.GroupVersionKind, ns string) (*unstructured.UnstructuredList, error)
 	Delete(gvk schema.GroupVersionKind, name, ns string) error
+	Update(newResource *unstructured.Unstructured) error
 }
 
 type k8sDynamicClientImpl struct {
@@ -103,9 +106,32 @@ func (c *k8sDynamicClientImpl) Get(gvk schema.GroupVersionKind, name, ns string)
 	if err != nil {
 		return nil, err
 	}
+
 	return obj, nil
 }
 
+func (c *k8sDynamicClientImpl) Update(newResource *unstructured.Unstructured) error {
+	gv := strings.Split(newResource.GetAPIVersion(), "/")
+	if len(gv) != 2 {
+		return fmt.Errorf("Resource has no proper group and version. Got: %s\n", newResource.GetAPIVersion())
+	}
+
+	resourceClient, err := c.initResourceClientForGVKAndNamespace(schema.GroupVersionKind{
+		Group:   gv[0],
+		Version: gv[1],
+		Kind:    newResource.GetKind(),
+	}, newResource.GetNamespace())
+	if err != nil {
+		return err
+	}
+
+	_, err = resourceClient.Update(context.TODO(), newResource, v1.UpdateOptions{})
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func (c *k8sDynamicClientImpl) List(gvk schema.GroupVersionKind, ns string) (*unstructured.UnstructuredList, error) {
 	resourceClient, err := c.initResourceClientForGVKAndNamespace(gvk, ns)
 	if err != nil {
@@ -192,6 +218,7 @@ func initSchema() *runtime.Scheme {
 	_ = cdiv1beta1.AddToScheme(s)
 	_ = aaqv1alpha1.AddToScheme(s)
 	_ = corev1.AddToScheme(s)
+	_ = appsv1.AddToScheme(s)
 	return s
 }
 

diff --git a/cluster-provision/k8s/1.30/extra-pre-pull-images b/cluster-provision/k8s/1.30/extra-pre-pull-images
@@ -1,23 +1,22 @@
-quay.io/kubevirtci/install-cni:1.15.0
-quay.io/kubevirtci/operator:1.15.0
-quay.io/kubevirtci/pilot:1.15.0
 quay.io/kubevirtci/proxyv2:1.15.0
 quay.io/calico/cni:v3.26.5
 quay.io/calico/kube-controllers:v3.26.5
 quay.io/calico/node:v3.26.5
 quay.io/prometheus-operator/prometheus-config-reloader:v0.75.1
 docker.io/grafana/grafana:11.1.0
-ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:c8bfe5bad3b5371a5677feb9e8e162da91b61bcac409c244f6f1b18c801ad006
-ghcr.io/k8snetworkplumbingwg/multus-dynamic-networks-controller@sha256:0bdf7dc9c15bdf7e5760955f05077c23868f3421141e8e623d75cf6b8cf36247
-ghcr.io/kubevirt/kubesecondarydns@sha256:44489bdf8affb0e82b68a7100bbee7d289151ada54ab2e76a9d3afef769a1f54
-quay.io/kubevirt/bridge-marker@sha256:18d954d58b9830738df9bf5c9a575d22b33096d1af26fb6bc2da09fb31c9f73a
-quay.io/kubevirt/cdi-apiserver:v1.61.0
-quay.io/kubevirt/cdi-controller:v1.61.0
-quay.io/kubevirt/cdi-operator:v1.61.0
-quay.io/kubevirt/cdi-uploadproxy:v1.61.0
-quay.io/kubevirt/cluster-network-addons-operator:v0.96.0
-quay.io/kubevirt/cni-default-plugins@sha256:0c354fa9d695b8cab97b459e8afea2f7662407a987e83f6f6f1a8af4b45726be
-quay.io/kubevirt/kubemacpool@sha256:677971a25ff3ce95d9e6ecc86090a09f0ae691ce67b8349384f1881562feed7b
-quay.io/kubevirt/macvtap-cni@sha256:850b89343ace7c7ea6b18dd8e11964613974e9d1f7377af03854d407fb15230a
-ghcr.io/k8snetworkplumbingwg/ovs-cni-plugin@sha256:54be8fcacee50af64deafa9e99f3fe079033630c00c4ed9f74d17b0d91009f10
-quay.io/openshift/origin-kube-rbac-proxy@sha256:e2def4213ec0657e72eb790ae8a115511d5b8f164a62d3568d2f1bff189917e8
+ghcr.io/k8snetworkplumbingwg/multus-dynamic-networks-controller@sha256:dee1979d92f0a31598a6e3569ac7004be7d29e7ca9e31db23753ef263110dc04
+ghcr.io/kubevirt/kubesecondarydns@sha256:77132adb5f840ceb0aadd408731a5c8b01a4b427a78084ab5e4e9b961195cb02
+quay.io/kubevirt/bridge-marker@sha256:5d24c6d1ecb0556896b7b81c7e5260b54173858425777b7a84df8a706c07e6d2
+quay.io/kubevirt/cdi-apiserver:v1.58.1
+quay.io/kubevirt/cdi-controller:v1.58.1
+quay.io/kubevirt/cdi-operator:v1.58.1
+quay.io/kubevirt/cdi-uploadproxy:v1.58.1
+docker.io/istio/install-cni:1.23.1
+docker.io/istio/pilot:1.23.1
+docker.io/istio/proxyv2:1.23.1
+quay.io/kubevirt/cluster-network-addons-operator:v0.87.0
+quay.io/kubevirt/cni-default-plugins@sha256:825e3f9fec1996c54a52cec806154945b38f76476b160d554c36e38dfffe5e61
+quay.io/kubevirt/kubemacpool@sha256:afba7d0c4a95d2d4924f6ee6ef16bbe59117877383819057f01809150829cb0c
+quay.io/kubevirt/macvtap-cni@sha256:434420511e09b2b5ede785a2c9062b6658ffbc26fbdd4629ce06110f9039c600
+quay.io/kubevirt/ovs-cni-plugin@sha256:5f7290e2294255ab2547c3b4bf48cc2d75531ec5a43e600366e9b2719bef983f
+quay.io/openshift/origin-kube-rbac-proxy@sha256:baedb268ac66456018fb30af395bb3d69af5fff3252ff5d549f0231b1ebb6901
diff --git a/cluster-provision/k8s/1.30/provision.sh b/cluster-provision/k8s/1.30/provision.sh
@@ -6,7 +6,7 @@ ARCH=$(uname -m)
 
 KUBEVIRTCI_SHARED_DIR=/var/lib/kubevirtci
 mkdir -p $KUBEVIRTCI_SHARED_DIR
-export ISTIO_VERSION=1.15.0
+export ISTIO_VERSION=1.23.1
 cat << EOF > $KUBEVIRTCI_SHARED_DIR/shared_vars.sh
 #!/bin/bash
 set -ex
@@ -52,7 +52,8 @@ export PATH="$ISTIO_BIN_DIR:$PATH"
 (
   set -E
   mkdir -p "$ISTIO_BIN_DIR"
-  curl "https://storage.googleapis.com/kubevirtci-istioctl-mirror/istio-${ISTIO_VERSION}/bin/istioctl" -o "$ISTIO_BIN_DIR/istioctl"
+  curl -L  https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istio-${ISTIO_VERSION}-linux-amd64.tar.gz -O
+  tar -xvf ./istio-${ISTIO_VERSION}-linux-amd64.tar.gz --strip-components=2 -C ${ISTIO_BIN_DIR} istio-${ISTIO_VERSION}/bin/istioctl
   chmod +x "$ISTIO_BIN_DIR/istioctl"
 )
 

diff --git a/cluster-provision/k8s/1.31/extra-pre-pull-images b/cluster-provision/k8s/1.31/extra-pre-pull-images
@@ -7,17 +7,19 @@ quay.io/calico/kube-controllers:v3.26.5
 quay.io/calico/node:v3.26.5
 quay.io/prometheus-operator/prometheus-config-reloader:v0.75.1
 docker.io/grafana/grafana:11.1.0
-ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:c8bfe5bad3b5371a5677feb9e8e162da91b61bcac409c244f6f1b18c801ad006
-ghcr.io/k8snetworkplumbingwg/multus-dynamic-networks-controller@sha256:0bdf7dc9c15bdf7e5760955f05077c23868f3421141e8e623d75cf6b8cf36247
-ghcr.io/kubevirt/kubesecondarydns@sha256:44489bdf8affb0e82b68a7100bbee7d289151ada54ab2e76a9d3afef769a1f54
-quay.io/kubevirt/bridge-marker@sha256:18d954d58b9830738df9bf5c9a575d22b33096d1af26fb6bc2da09fb31c9f73a
-quay.io/kubevirt/cdi-apiserver:v1.61.0
-quay.io/kubevirt/cdi-controller:v1.61.0
-quay.io/kubevirt/cdi-operator:v1.61.0
-quay.io/kubevirt/cdi-uploadproxy:v1.61.0
-quay.io/kubevirt/cluster-network-addons-operator:v0.96.0
-quay.io/kubevirt/cni-default-plugins@sha256:0c354fa9d695b8cab97b459e8afea2f7662407a987e83f6f6f1a8af4b45726be
-quay.io/kubevirt/kubemacpool@sha256:677971a25ff3ce95d9e6ecc86090a09f0ae691ce67b8349384f1881562feed7b
-quay.io/kubevirt/macvtap-cni@sha256:850b89343ace7c7ea6b18dd8e11964613974e9d1f7377af03854d407fb15230a
-ghcr.io/k8snetworkplumbingwg/ovs-cni-plugin@sha256:54be8fcacee50af64deafa9e99f3fe079033630c00c4ed9f74d17b0d91009f10
-quay.io/openshift/origin-kube-rbac-proxy@sha256:e2def4213ec0657e72eb790ae8a115511d5b8f164a62d3568d2f1bff189917e8
+ghcr.io/k8snetworkplumbingwg/multus-dynamic-networks-controller@sha256:dee1979d92f0a31598a6e3569ac7004be7d29e7ca9e31db23753ef263110dc04
+ghcr.io/kubevirt/kubesecondarydns@sha256:77132adb5f840ceb0aadd408731a5c8b01a4b427a78084ab5e4e9b961195cb02
+quay.io/kubevirt/bridge-marker@sha256:5d24c6d1ecb0556896b7b81c7e5260b54173858425777b7a84df8a706c07e6d2
+quay.io/kubevirt/cdi-apiserver:v1.58.1
+quay.io/kubevirt/cdi-controller:v1.58.1
+quay.io/kubevirt/cdi-operator:v1.58.1
+quay.io/kubevirt/cdi-uploadproxy:v1.58.1
+docker.io/istio/install-cni:1.23.1
+docker.io/istio/pilot:1.23.1
+docker.io/istio/proxyv2:1.23.1
+quay.io/kubevirt/cluster-network-addons-operator:v0.87.0
+quay.io/kubevirt/cni-default-plugins@sha256:825e3f9fec1996c54a52cec806154945b38f76476b160d554c36e38dfffe5e61
+quay.io/kubevirt/kubemacpool@sha256:afba7d0c4a95d2d4924f6ee6ef16bbe59117877383819057f01809150829cb0c
+quay.io/kubevirt/macvtap-cni@sha256:434420511e09b2b5ede785a2c9062b6658ffbc26fbdd4629ce06110f9039c600
+quay.io/kubevirt/ovs-cni-plugin@sha256:5f7290e2294255ab2547c3b4bf48cc2d75531ec5a43e600366e9b2719bef983f
+quay.io/openshift/origin-kube-rbac-proxy@sha256:baedb268ac66456018fb30af395bb3d69af5fff3252ff5d549f0231b1ebb6901
diff --git a/cluster-provision/k8s/1.31/provision.sh b/cluster-provision/k8s/1.31/provision.sh
@@ -6,7 +6,7 @@ ARCH=$(uname -m)
 
 KUBEVIRTCI_SHARED_DIR=/var/lib/kubevirtci
 mkdir -p $KUBEVIRTCI_SHARED_DIR
-export ISTIO_VERSION=1.15.0
+export ISTIO_VERSION=1.23.1
 cat << EOF > $KUBEVIRTCI_SHARED_DIR/shared_vars.sh
 #!/bin/bash
 set -ex
@@ -52,7 +52,8 @@ export PATH="$ISTIO_BIN_DIR:$PATH"
 (
   set -E
   mkdir -p "$ISTIO_BIN_DIR"
-  curl "https://storage.googleapis.com/kubevirtci-istioctl-mirror/istio-${ISTIO_VERSION}/bin/istioctl" -o "$ISTIO_BIN_DIR/istioctl"
+  curl -L  https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istio-${ISTIO_VERSION}-linux-amd64.tar.gz -O
+  tar -xvf ./istio-${ISTIO_VERSION}-linux-amd64.tar.gz --strip-components=2 -C ${ISTIO_BIN_DIR} istio-${ISTIO_VERSION}/bin/istioctl
   chmod +x "$ISTIO_BIN_DIR/istioctl"
 )
 

diff --git a/cluster-provision/k8s/1.32/extra-pre-pull-images b/cluster-provision/k8s/1.32/extra-pre-pull-images
@@ -1,23 +1,22 @@
-quay.io/kubevirtci/install-cni:1.15.0
-quay.io/kubevirtci/operator:1.15.0
-quay.io/kubevirtci/pilot:1.15.0
 quay.io/kubevirtci/proxyv2:1.15.0
 quay.io/calico/cni:v3.26.5
 quay.io/calico/kube-controllers:v3.26.5
 quay.io/calico/node:v3.26.5
 quay.io/prometheus-operator/prometheus-config-reloader:v0.75.1
 docker.io/grafana/grafana:11.1.0
-ghcr.io/k8snetworkplumbingwg/multus-cni@sha256:c8bfe5bad3b5371a5677feb9e8e162da91b61bcac409c244f6f1b18c801ad006
-ghcr.io/k8snetworkplumbingwg/multus-dynamic-networks-controller@sha256:0bdf7dc9c15bdf7e5760955f05077c23868f3421141e8e623d75cf6b8cf36247
-ghcr.io/kubevirt/kubesecondarydns@sha256:44489bdf8affb0e82b68a7100bbee7d289151ada54ab2e76a9d3afef769a1f54
-quay.io/kubevirt/bridge-marker@sha256:18d954d58b9830738df9bf5c9a575d22b33096d1af26fb6bc2da09fb31c9f73a
-quay.io/kubevirt/cdi-apiserver:v1.61.0
-quay.io/kubevirt/cdi-controller:v1.61.0
-quay.io/kubevirt/cdi-operator:v1.61.0
-quay.io/kubevirt/cdi-uploadproxy:v1.61.0
-quay.io/kubevirt/cluster-network-addons-operator:v0.96.0
-quay.io/kubevirt/cni-default-plugins@sha256:0c354fa9d695b8cab97b459e8afea2f7662407a987e83f6f6f1a8af4b45726be
-quay.io/kubevirt/kubemacpool@sha256:677971a25ff3ce95d9e6ecc86090a09f0ae691ce67b8349384f1881562feed7b
-quay.io/kubevirt/macvtap-cni@sha256:850b89343ace7c7ea6b18dd8e11964613974e9d1f7377af03854d407fb15230a
-ghcr.io/k8snetworkplumbingwg/ovs-cni-plugin@sha256:54be8fcacee50af64deafa9e99f3fe079033630c00c4ed9f74d17b0d91009f10
-quay.io/openshift/origin-kube-rbac-proxy@sha256:e2def4213ec0657e72eb790ae8a115511d5b8f164a62d3568d2f1bff189917e8
+ghcr.io/k8snetworkplumbingwg/multus-dynamic-networks-controller@sha256:dee1979d92f0a31598a6e3569ac7004be7d29e7ca9e31db23753ef263110dc04
+ghcr.io/kubevirt/kubesecondarydns@sha256:77132adb5f840ceb0aadd408731a5c8b01a4b427a78084ab5e4e9b961195cb02
+quay.io/kubevirt/bridge-marker@sha256:5d24c6d1ecb0556896b7b81c7e5260b54173858425777b7a84df8a706c07e6d2
+quay.io/kubevirt/cdi-apiserver:v1.58.1
+quay.io/kubevirt/cdi-controller:v1.58.1
+quay.io/kubevirt/cdi-operator:v1.58.1
+quay.io/kubevirt/cdi-uploadproxy:v1.58.1
+docker.io/istio/install-cni:1.23.1
+docker.io/istio/pilot:1.23.1
+docker.io/istio/proxyv2:1.23.1
+quay.io/kubevirt/cluster-network-addons-operator:v0.87.0
+quay.io/kubevirt/cni-default-plugins@sha256:825e3f9fec1996c54a52cec806154945b38f76476b160d554c36e38dfffe5e61
+quay.io/kubevirt/kubemacpool@sha256:afba7d0c4a95d2d4924f6ee6ef16bbe59117877383819057f01809150829cb0c
+quay.io/kubevirt/macvtap-cni@sha256:434420511e09b2b5ede785a2c9062b6658ffbc26fbdd4629ce06110f9039c600
+quay.io/kubevirt/ovs-cni-plugin@sha256:5f7290e2294255ab2547c3b4bf48cc2d75531ec5a43e600366e9b2719bef983f
+quay.io/openshift/origin-kube-rbac-proxy@sha256:baedb268ac66456018fb30af395bb3d69af5fff3252ff5d549f0231b1ebb6901
diff --git a/cluster-provision/k8s/1.32/provision.sh b/cluster-provision/k8s/1.32/provision.sh
@@ -6,7 +6,7 @@ ARCH=$(uname -m)
 
 KUBEVIRTCI_SHARED_DIR=/var/lib/kubevirtci
 mkdir -p $KUBEVIRTCI_SHARED_DIR
-export ISTIO_VERSION=1.15.0
+export ISTIO_VERSION=1.23.1
 cat << EOF > $KUBEVIRTCI_SHARED_DIR/shared_vars.sh
 #!/bin/bash
 set -ex
@@ -52,7 +52,8 @@ export PATH="$ISTIO_BIN_DIR:$PATH"
 (
   set -E
   mkdir -p "$ISTIO_BIN_DIR"
-  curl "https://storage.googleapis.com/kubevirtci-istioctl-mirror/istio-${ISTIO_VERSION}/bin/istioctl" -o "$ISTIO_BIN_DIR/istioctl"
+  curl -L  https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istio-${ISTIO_VERSION}-linux-amd64.tar.gz -O
+  tar -xvf ./istio-${ISTIO_VERSION}-linux-amd64.tar.gz --strip-components=2 -C ${ISTIO_BIN_DIR} istio-${ISTIO_VERSION}/bin/istioctl
   chmod +x "$ISTIO_BIN_DIR/istioctl"
 )
 

diff --git a/cluster-provision/k8s/provision.sh b/cluster-provision/k8s/provision.sh
@@ -4,7 +4,7 @@
 set -ex
 
 PHASES_DEFAULT="linux,k8s"
-PHASES="${PHASES:-$PHASES_DEFAULT}"
+PHASES="$PHASES_DEFAULT"
 CHECK_CLUSTER="${CHECK_CLUSTER:-false}"
 export SLIM="${SLIM:-false}"
 BYPASS_PMAN_CHANGE_CHECK=${BYPASS_PMAN_CHANGE_CHECK:-false}