remove windows

Makefile

@@ -253,7 +253,6 @@ generate-e2e-templates: $(KUSTOMIZE)
 	$(KUSTOMIZE) build $(OCI_TEMPLATES)/v1beta1/cluster-template-externally-managed-vcn --load-restrictor LoadRestrictionsNone > $(OCI_TEMPLATES)/v1beta1/cluster-template-externally-managed-vcn.yaml
 	$(KUSTOMIZE) build $(OCI_TEMPLATES)/v1beta1/cluster-template-machine-pool --load-restrictor LoadRestrictionsNone > $(OCI_TEMPLATES)/v1beta1/cluster-template-machine-pool.yaml
 	$(KUSTOMIZE) build $(OCI_TEMPLATES)/v1beta1/cluster-template-managed --load-restrictor LoadRestrictionsNone > $(OCI_TEMPLATES)/v1beta1/cluster-template-managed.yaml
-	$(KUSTOMIZE) build $(OCI_TEMPLATES)/v1beta1/cluster-template-windows-calico --load-restrictor LoadRestrictionsNone > $(OCI_TEMPLATES)/v1beta1/cluster-template-windows-calico.yaml
 
 .PHONY: test-e2e-run
 test-e2e-run: generate-e2e-templates $(GINKGO) $(ENVSUBST) ## Run e2e tests

scripts/ci-e2e.sh

@@ -24,7 +24,6 @@ source "${REPO_ROOT}/hack/ensure-tags.sh"
 : "${OCI_UPGRADE_IMAGE_ID:?Environment variable empty or not defined.}"
 : "${OCI_ALTERNATIVE_REGION_IMAGE_ID:?Environment variable empty or not defined.}"
 : OCI_MANAGED_NODE_IMAGE_ID
-: OCI_WINDOWS_IMAGE_ID
 
 export LOCAL_ONLY=${LOCAL_ONLY:-"true"}
 

test/e2e/cluster_test.go

@@ -199,29 +199,6 @@ var _ = Describe("Workload cluster creation", func() {
 		validateOLImage(namespace.Name, clusterName)
 	})
 
-	It("Windows - With 1 Linux control-plane nodes and with 1 Windows worker nodes using Calico CNI", func() {
-		clusterName = getClusterName(clusterNamePrefix, "windows-calico")
-		clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{
-			ClusterProxy: bootstrapClusterProxy,
-			ConfigCluster: clusterctl.ConfigClusterInput{
-				LogFolder:                filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()),
-				ClusterctlConfigPath:     clusterctlConfigPath,
-				KubeconfigPath:           bootstrapClusterProxy.GetKubeconfigPath(),
-				InfrastructureProvider:   clusterctl.DefaultInfrastructureProvider,
-				Flavor:                   "windows-calico",
-				Namespace:                namespace.Name,
-				ClusterName:              clusterName,
-				KubernetesVersion:        e2eConfig.GetVariable(capi_e2e.KubernetesVersion),
-				ControlPlaneMachineCount: pointer.Int64Ptr(1),
-				WorkerMachineCount:       pointer.Int64Ptr(1),
-			},
-			WaitForClusterIntervals:      e2eConfig.GetIntervals(specName, "wait-cluster"),
-			WaitForControlPlaneIntervals: e2eConfig.GetIntervals(specName, "wait-control-plane"),
-			WaitForMachineDeployments:    e2eConfig.GetIntervals(specName, "wait-windows-worker-nodes"),
-		}, result)
-		validateWindowsImage(namespace.Name, clusterName)
-	})
-
 	It("Cloud Provider OCI testing [PRBlocking]", func() {
 		clusterName = getClusterName(clusterNamePrefix, "ccm-testing")
 		clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{
@@ -983,33 +960,6 @@ func validateOLImage(nameSpace string, clusterName string) {
 	}
 }
 
-func validateWindowsImage(nameSpace string, clusterName string) {
-	lister := bootstrapClusterProxy.GetClient()
-	inClustersNamespaceListOption := client.InNamespace(nameSpace)
-	matchClusterListOption := client.MatchingLabels{
-		clusterv1.ClusterLabelName: clusterName,
-	}
-
-	machineList := &clusterv1.MachineList{}
-	Expect(lister.List(context.Background(), machineList, inClustersNamespaceListOption, matchClusterListOption)).
-		To(Succeed(), "Couldn't list machines for the cluster %q", clusterName)
-
-	Expect(len(machineList.Items)).To(Equal(2))
-	for _, machine := range machineList.Items {
-		if machine.Labels["os"] == "windows" {
-			instanceOcid := strings.Split(*machine.Spec.ProviderID, "//")[1]
-			Log(fmt.Sprintf("Instance OCID is %s", instanceOcid))
-			resp, err := computeClient.GetInstance(context.Background(), core.GetInstanceRequest{
-				InstanceId: common.String(instanceOcid),
-			})
-			Expect(err).NotTo(HaveOccurred())
-			instanceSourceDetails, ok := resp.SourceDetails.(core.InstanceSourceViaImageDetails)
-			Expect(ok).To(BeTrue())
-			Expect(*instanceSourceDetails.ImageId).To(Equal(os.Getenv("OCI_WINDOWS_IMAGE_ID")))
-		}
-	}
-}
-
 func getClusterName(prefix, specName string) string {
 	clusterName := os.Getenv("CLUSTER_NAME")
 	if clusterName == "" {

test/e2e/config/e2e_conf.yaml

@@ -71,7 +71,6 @@ providers:
           - sourcePath: "../data/infrastructure-oci/v1beta1/cluster-template-externally-managed-vcn.yaml"
           - sourcePath: "../data/infrastructure-oci/v1beta1/cluster-template-machine-pool.yaml"
           - sourcePath: "../data/infrastructure-oci/v1beta1/cluster-template-managed.yaml"
-          - sourcePath: "../data/infrastructure-oci/v1beta1/cluster-template-windows-calico.yaml"
           - sourcePath: "../data/infrastructure-oci/v1beta1/metadata.yaml"
 
 variables:
@@ -110,7 +109,6 @@ intervals:
   default/wait-cluster: ["30m", "10s"]
   default/wait-control-plane: ["30m", "10s"]
   default/wait-worker-nodes: ["30m", "10s"]
-  default/wait-windows-worker-nodes: ["60m", "30s"]
   default/wait-cluster-bare-metal: [ "60m", "10s" ]
   default/wait-control-plane-bare-metal: [ "60m", "10s" ]
   default/wait-worker-nodes-bare-metal: [ "60m", "10s" ]