Merge pull request #5012 from djoshy/4.18-windows-machineset

OCPBUGS-55428: MSBIC should not update windows machinesets

Author: openshift-merge-bot[bot]

pkg/controller/machine-set-boot-image/machine_set_boot_image_controller.go

@@ -89,10 +89,11 @@ const (
 
 	// Labels and Annotations required for determining architecture of a machineset
 	MachineSetArchAnnotationKey = "capacity.cluster-autoscaler.kubernetes.io/labels"
-	ArchLabelKey                = "kubernetes.io/arch="
-
 	// Name of managed worker secret
 	ManagedWorkerSecretName = "worker-user-data-managed"
+
+	ArchLabelKey = "kubernetes.io/arch="
+	OSLabelKey   = "machine.openshift.io/os-id"
 )
 
 // New returns a new machine-set-boot-image controller.
@@ -401,6 +402,13 @@ func (ctrl *Controller) syncMAPIMachineSet(machineSet *machinev1beta1.MachineSet
 		return fmt.Errorf("unexpected OwnerReference: %v. Please remove this machineset from boot image management to avoid errors", machineSet.GetOwnerReferences()[0].Kind+"/"+machineSet.GetOwnerReferences()[0].Name)
 	}
 
+	if os, ok := machineSet.Spec.Template.Labels[OSLabelKey]; ok {
+		if os == "Windows" {
+			klog.Infof("machineset %s has a windows os label, skipping boot image update", machineSet.Name)
+			return nil
+		}
+	}
+
 	// Fetch the architecture type of this machineset
 	arch, err := getArchFromMachineSet(machineSet)
 	if err != nil {