Merge pull request #29625 from djoshy/add-wait-status

NO-ISSUE: Wait for MachineConfiguration status to be upto date

Author: openshift-merge-bot[bot]

test/extended/machine_config/boot_image_update_agnostic.go

@@ -38,6 +38,9 @@ func PartialMachineSetTest(oc *exutil.CLI, fixture string) {
 	err := oc.Run("apply").Args("-f", fixture).Execute()
 	o.Expect(err).NotTo(o.HaveOccurred())
 
+	// Ensure status accounts for the fixture that was applied
+	WaitForMachineConfigurationStatusUpdate(oc)
+
 	// Pick a random machineset to test
 	machineClient, err := machineclient.NewForConfig(oc.KubeFramework().ClientConfig())
 	o.Expect(err).NotTo(o.HaveOccurred())
@@ -66,6 +69,9 @@ func NoneMachineSetTest(oc *exutil.CLI, fixture string) {
 	err := oc.Run("apply").Args("-f", fixture).Execute()
 	o.Expect(err).NotTo(o.HaveOccurred())
 
+	// Ensure status accounts for the fixture that was applied
+	WaitForMachineConfigurationStatusUpdate(oc)
+
 	// Step through all machinesets and verify boot images are reconciled correctly.
 	machineClient, err := machineclient.NewForConfig(oc.KubeFramework().ClientConfig())
 	o.Expect(err).NotTo(o.HaveOccurred())
@@ -83,6 +89,9 @@ func DegradeOnOwnerRefTest(oc *exutil.CLI, fixture string) {
 	err := oc.Run("apply").Args("-f", fixture).Execute()
 	o.Expect(err).NotTo(o.HaveOccurred())
 
+	// Ensure status accounts for the fixture that was applied
+	WaitForMachineConfigurationStatusUpdate(oc)
+
 	// Pick a random machineset to test
 	machineClient, err := machineclient.NewForConfig(oc.KubeFramework().ClientConfig())
 	o.Expect(err).NotTo(o.HaveOccurred())

test/extended/machine_config/boot_image_update_aws.go

@@ -36,6 +36,9 @@ var _ = g.Describe("[sig-mco][OCPFeatureGate:ManagedBootImagesAWS][Serial]", fun
 		// Clear out boot image configuration between tests
 		err := oc.Run("apply").Args("-f", emptyMachineSetFixture).Execute()
 		o.Expect(err).NotTo(o.HaveOccurred())
+
+		// Ensure status accounts for the fixture that was applied
+		WaitForMachineConfigurationStatusUpdate(oc)
 	})
 
 	g.It("Should update boot images only on MachineSets that are opted in [apigroup:machineconfiguration.openshift.io]", func() {

test/extended/machine_config/helpers.go

@@ -220,6 +220,22 @@ func WaitForBootImageControllerToComplete(oc *exutil.CLI) {
 	}, 3*time.Minute, 5*time.Second).MustPassRepeatedly(3).Should(o.BeTrue())
 }
 
+// WaitForMachineConfigurationStatus waits until the MCO syncs the operator status to the latest spec
+func WaitForMachineConfigurationStatusUpdate(oc *exutil.CLI) {
+	machineConfigurationClient, err := mcopclient.NewForConfig(oc.KubeFramework().ClientConfig())
+	o.Expect(err).NotTo(o.HaveOccurred())
+	// This has a MustPassRepeatedly(3) to ensure there isn't a false positive by checking the
+	// status too quickly after applying the fixture.
+	o.Eventually(func() bool {
+		mcop, err := machineConfigurationClient.OperatorV1().MachineConfigurations().Get(context.TODO(), "cluster", metav1.GetOptions{})
+		if err != nil {
+			framework.Logf("Failed to grab machineconfiguration object, error :%v", err)
+			return false
+		}
+		return mcop.Generation == mcop.Status.ObservedGeneration
+	}, 3*time.Minute, 1*time.Second).MustPassRepeatedly(3).Should(o.BeTrue())
+}
+
 // IsMachineConfigPoolConditionTrue returns true when the conditionType is present and set to `ConditionTrue`
 func IsMachineConfigPoolConditionTrue(conditions []mcfgv1.MachineConfigPoolCondition, conditionType mcfgv1.MachineConfigPoolConditionType) bool {
 	for _, condition := range conditions {