From ed2406a68628c6731a68a6d5532c9981004852c1 Mon Sep 17 00:00:00 2001
From: rrasouli <rrasouli@redhat.com>
Date: Thu, 26 Feb 2026 09:31:26 +0200
Subject: [PATCH] Add Windows images to CI registry for WINC tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Enable Windows container tests in Prow CI by pre-mirroring Windows
images to registry.ci.openshift.org and using ImageTagMirrorSet for
transparent redirection.

Changes:
1. Add Windows PowerShell images to supplemental CI images:
   - mcr.microsoft.com/powershell:lts-nanoserver-1809 (Server 2019)
   - mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022 (Server 2022)

2. Create ImageTagMirrorSet in cucushift-winc-prepare:
   - Redirects mcr.microsoft.com/powershell → registry.ci.openshift.org/microsoft/powershell
   - Works in both connected (CI registry) and disconnected (ephemeral mirror) modes

How it works:
- CI infrastructure automatically mirrors images to registry.ci.openshift.org
- ITMS transparently redirects image pulls during test execution
- Tests continue using mcr.microsoft.com URLs in ConfigMap
- No test code changes required

Supported Windows versions:
- Server 2019 (1809) - TODO: Remove after AMI upgrades
- Server 2022 (ltsc2022) - Default

Note: Server 2025 (ltsc2025) will be added when Microsoft publishes the image

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 .../cucushift-winc-prepare-commands.sh        | 66 ++++++++++++++++++-
 core-services/image-mirroring/_config.yaml    | 20 ++++++
 2 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/ci-operator/step-registry/cucushift/winc/prepare/cucushift-winc-prepare-commands.sh b/ci-operator/step-registry/cucushift/winc/prepare/cucushift-winc-prepare-commands.sh
index 6a0b72fce6cac..ce5948ca57870 100755
--- a/ci-operator/step-registry/cucushift/winc/prepare/cucushift-winc-prepare-commands.sh
+++ b/ci-operator/step-registry/cucushift/winc/prepare/cucushift-winc-prepare-commands.sh
@@ -13,6 +13,61 @@ function create_winc_test_configmap()
   oc get cm winc-test-config -oyaml -n winc-test
 }
 
+function setup_image_mirroring()
+{
+  # Create ImageTagMirrorSet to redirect Windows container images to CI registry
+  # Images are pre-mirrored via core-services/image-mirroring/_config.yaml
+  # This works for both connected Prow (registry.ci.openshift.org) and disconnected (ephemeral mirror)
+
+  echo "Setting up ImageTagMirrorSet for Windows container images..."
+
+  # Determine mirror registry based on environment
+  if [ -f "${SHARED_DIR}/mirror_registry_url" ]; then
+    # Disconnected environment with ephemeral mirror registry
+    MIRROR_REGISTRY_HOST=$(head -n 1 "${SHARED_DIR}/mirror_registry_url")
+    echo "Disconnected mode: Using ephemeral mirror registry at ${MIRROR_REGISTRY_HOST}"
+  else
+    # Connected Prow CI - use pre-mirrored images from CI registry
+    MIRROR_REGISTRY_HOST="registry.ci.openshift.org"
+    echo "Connected mode: Using pre-mirrored images from ${MIRROR_REGISTRY_HOST}"
+  fi
+
+  # Create ImageTagMirrorSet to redirect Windows images to mirror
+  # Includes PowerShell containers and CSI driver images for storage tests
+  # PowerShell: Server 2019 (1809), Server 2022 (ltsc2022)
+  # CSI: Azure File and vSphere drivers for OCP-66352
+  # TODO: Remove Server 2019 support after AMI/image upgrades to Server 2022
+  cat <<EOF | oc create -f -
+apiVersion: config.openshift.io/v1
+kind: ImageTagMirrorSet
+metadata:
+  name: winc-test-tagmirrorset
+spec:
+  imageTagMirrors:
+  - source: mcr.microsoft.com/powershell
+    mirrors:
+    - ${MIRROR_REGISTRY_HOST}/microsoft/powershell
+  - source: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar
+    mirrors:
+    - ${MIRROR_REGISTRY_HOST}/microsoft/csi-node-driver-registrar
+  - source: mcr.microsoft.com/k8s/csi/azurefile-csi
+    mirrors:
+    - ${MIRROR_REGISTRY_HOST}/microsoft/azurefile-csi
+  - source: registry.k8s.io/sig-storage/csi-node-driver-registrar
+    mirrors:
+    - ${MIRROR_REGISTRY_HOST}/k8s/csi-node-driver-registrar
+  - source: registry.k8s.io/csi-vsphere/driver
+    mirrors:
+    - ${MIRROR_REGISTRY_HOST}/k8s/vsphere-csi-driver
+  - source: registry.k8s.io/sig-storage/livenessprobe
+    mirrors:
+    - ${MIRROR_REGISTRY_HOST}/k8s/livenessprobe
+EOF
+
+  echo "ImageTagMirrorSet created successfully"
+  oc get imagetagmirrorset winc-test-tagmirrorset -o yaml
+}
+
 function create_workloads()
 {
   oc new-project winc-test
@@ -206,8 +261,11 @@ while [[ $(oc -n openshift-machine-api get machineset/${winworker_machineset_nam
 # Timeout increased to 30m to accommodate BYOH node configuration time
 oc wait nodes -l kubernetes.io/os=windows --for condition=Ready=True --timeout=30m
 
-# Choose the Windows container vesion depending on the Windows version
+# Choose the Windows container version depending on the Windows version
 # installed on the Windows workers
+# Supported: Server 2019 (1809), Server 2022 (ltsc2022)
+# TODO: Remove Server 2019 support after AMI/image upgrades to Server 2022
+# TODO: Add Server 2025 (ltsc2025) when Microsoft publishes the image
 os_version=$(oc get nodes -l 'kubernetes.io/os=windows' -o=jsonpath="{.items[0].status.nodeInfo.osImage}")
 
 windows_container_image="mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022"
@@ -216,6 +274,12 @@ then
     windows_container_image="mcr.microsoft.com/powershell:lts-nanoserver-1809"
 fi
 
+# Setup image mirroring for Prow CI (if mirror registry is available)
+# This creates ImageTagMirrorSet to redirect Windows image pulls to CI registry
+setup_image_mirroring
+
+# Create workloads using the original image (ITMS will redirect to mirror)
 create_workloads $windows_container_image
 
+# Create ConfigMap with the original image (ITMS will redirect to mirror)
 create_winc_test_configmap $windows_os_image_id $windows_container_image
diff --git a/core-services/image-mirroring/_config.yaml b/core-services/image-mirroring/_config.yaml
index 26d4c05650790..d295ee61c4a64 100644
--- a/core-services/image-mirroring/_config.yaml
+++ b/core-services/image-mirroring/_config.yaml
@@ -883,6 +883,26 @@ supplementalCIImages:
     image: quay.io/microshift/microshift-ci:ci-brew
   microsoft/azure-cli:latest:
     image: mcr.microsoft.com/azure-cli:latest
+  microsoft/powershell:lts-nanoserver-1809:
+    image: mcr.microsoft.com/powershell:lts-nanoserver-1809
+    # TODO: Remove after Windows Server 2019 deprecation
+  microsoft/powershell:lts-nanoserver-ltsc2022:
+    image: mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022
+  microsoft/csi-node-driver-registrar:v2.8.0:
+    image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.8.0
+    # Azure CSI driver dependency for Windows storage tests (OCP-66352)
+  microsoft/azurefile-csi:v1.35.0:
+    image: mcr.microsoft.com/k8s/csi/azurefile-csi:v1.35.0
+    # Azure CSI driver for Windows storage tests (OCP-66352)
+  k8s/csi-node-driver-registrar:v2.7.0:
+    image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.7.0
+    # vSphere CSI driver dependency for Windows storage tests (OCP-66352)
+  k8s/vsphere-csi-driver:v3.3.0:
+    image: registry.k8s.io/csi-vsphere/driver:v3.3.0
+    # vSphere CSI driver for Windows storage tests (OCP-66352)
+  k8s/livenessprobe:v2.9.0:
+    image: registry.k8s.io/sig-storage/livenessprobe:v2.9.0
+    # vSphere CSI driver dependency for Windows storage tests (OCP-66352)
   ci/rhdh-e2e-runner:main:
     image: quay.io/rhdh-community/rhdh-e2e-runner:main
   ci/rhdh-e2e-runner:release-1.3: