reconciled merged kustomize for prow-ci-version and prow-machine-pool-ci-version

Author: alimaazamat

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

@@ -4,7 +4,18 @@ namespace: default
 resources:
 - ../prow
 - ../../../addons/metrics-server/metrics-server-resource-set.yaml
+# resources from prow-machine-pool
+#- ../prow/cni-resource-set.yaml
+# - ../../../addons/windows/csi-proxy/csi-proxy-resource-set.yaml
+# - ../../../addons/windows/containerd-logging/containerd-logger-resource-set.yaml
+# - ../../../addons/cluster-api-helm/calico.yaml
+# - ../../../addons/cluster-api-helm/azuredisk-csi-driver.yaml
+# - ../../../addons/cluster-api-helm/cloud-provider-azure.yaml
+# - ../../../addons/cluster-api-helm/cloud-provider-azure-ci.yaml
+- ../../../flavors/machinepool/machine-pool-deployment.yaml #Azuremachinepool ${CLUSTER_NAME}-mp-0
+- ../../../flavors/machinepool-windows/machine-pool-deployment-windows.yaml #machinepool ${CLUSTER_NAME}-mp-win
 patches:
+# existing patches
 - path: patches/oot-credential-provider.yaml
   target:
     group: bootstrap.cluster.x-k8s.io
@@ -39,22 +50,14 @@ patches:
     name: .*-md-win
     namespace: default
     version: v1beta1
-- path: ../patches/control-plane-kubeadm-boostrap-ci-version.yaml
-  target:
-    group: controlplane.cluster.x-k8s.io
-    kind: KubeadmControlPlane
-    name: .*-control-plane
-    version: v1beta1
-- path: ../patches/control-plane-image-ci-version.yaml
+# MachinePool-specific patches
+- path: ../patches/azuremachinepool-vmextension.yaml
+- path: ../patches/tags.yaml
 - path: ../patches/controller-manager.yaml
-- path: ../patches/windows-feature-gates.yaml
+- path: ../patches/machine-pool-worker-counts.yaml
 - path: ../patches/windows-containerd-labels.yaml
-- path: ../patches/windows-machine-deployment-replicas.yaml
-- path: patches/machine-deployment-ci-version.yaml
-- path: patches/machine-deployment-ci-version-windows.yaml
-- path: patches/machine-deployment-ci-version-control-plane.yaml
-- path: ../patches/metrics-server-enabled-cluster.yaml
-- path: ../patches/uami-md-0.yaml
+- path: ../patches/cluster-label-calico.yaml
+- path: ../patches/cluster-label-cloud-provider-azure.yaml
 configMapGenerator:
 - behavior: merge
   files: