Merge pull request #2016 from jsturtevant/revert-image-gallery

Revert #1993 - Continue to use image gallery for the e2e test on Windows

Author: k8s-ci-robot

templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml

@@ -401,12 +401,11 @@ spec:
   template:
     spec:
       image:
-        sharedGallery:
-          gallery: CAPZTestingImages
-          name: capi-windows-2022-containerd
-          resourceGroup: capz-ci
-          subscriptionID: ${AZURE_SUBSCRIPTION_ID}
-          version: 0.3.1642811382
+        marketplace:
+          offer: capi-windows
+          publisher: cncf-upstream
+          sku: k8s-1dot23dot3-windows-2022-containerd
+          version: latest
       osDisk:
         diskSizeGB: 128
         managedDisk:

templates/test/ci/cluster-template-prow-ci-version.yaml

@@ -401,12 +401,11 @@ spec:
   template:
     spec:
       image:
-        sharedGallery:
-          gallery: CAPZTestingImages
-          name: capi-windows-2019-containerd
-          resourceGroup: capz-ci
-          subscriptionID: ${AZURE_SUBSCRIPTION_ID}
-          version: 0.3.1643001114
+        marketplace:
+          offer: capi-windows
+          publisher: cncf-upstream
+          sku: k8s-1dot23dot3-windows-2019-containerd
+          version: latest
       osDisk:
         diskSizeGB: 128
         managedDisk:

templates/test/ci/prow-ci-version-windows-containerd-2022/patches/windows-image-update.yaml

@@ -7,9 +7,10 @@ spec:
   template:
     spec:
       image:
-        sharedGallery:
-          resourceGroup: "capz-ci"
-          name: "capi-windows-2022-containerd"
-          subscriptionID: "${AZURE_SUBSCRIPTION_ID}"
-          gallery: "CAPZTestingImages"
-          version: "0.3.1642811382"
+        # we use the an older image as a workaround there is no published marketplace image for k8s CI versions.
+        # the binaries and images will get replaced to the desired version by the pre-kubeadm script.
+        marketplace:
+          publisher: cncf-upstream
+          offer: capi-windows
+          sku: k8s-1dot23dot3-windows-2022-containerd
+          version: "latest"

templates/test/ci/prow-ci-version/kustomization.yaml

@@ -11,10 +11,10 @@ patchesStrategicMerge:
   - ../patches/windows-containerd-patch.yaml
   - ../patches/machine-deployment-worker-counts.yaml
   - patches/machine-deployment-ci-version.yaml
+  - patches/machine-deployment-ci-version-windows.yaml
   - ../patches/metrics-server-enabled-cluster.yaml
   - patches/controller-manager-featuregates.yaml
   - ../patches/windows-containerd-enabled-cluster.yaml
-  - patches/machine-deployment-ci-version-windows-shared-gallery.yaml
 patches:
 - target:
     group: bootstrap.cluster.x-k8s.io
@@ -36,12 +36,6 @@ patches:
     kind: KubeadmControlPlane
     name: .*-control-plane
   path: ../patches/control-plane-kubeadm-boostrap-ci-version.yaml
-- target:
-    group: infrastructure.cluster.x-k8s.io/v1beta1
-    version: v1beta1
-    kind: AzureMachineTemplate
-    name: ${CLUSTER_NAME}-md-win
-  path: patches/drop-machine-deployment-windows-image-marketplace.yaml
 configMapGenerator:
   - name: cni-${CLUSTER_NAME}-calico
     behavior: merge

templates/test/ci/prow-ci-version/patches/drop-machine-deployment-windows-image-marketplace.yaml

@@ -0,0 +1,16 @@
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: AzureMachineTemplate
+metadata:
+  name: ${CLUSTER_NAME}-md-win
+spec:
+  template:
+    spec:
+      image:
+        # we use the an older image as a workaround there is no published marketplace image for k8s CI versions.
+        # the binaries and images will get replaced to the desired version by the pre-kubeadm script.
+        marketplace:
+          publisher: cncf-upstream
+          offer: capi-windows
+          sku: k8s-1dot23dot3-windows-2019-containerd
+          version: "latest"
+