Merge pull request #29598 from djoshy/add-opt-out

MCO-1594: updates for ManagedBootImageStatus

Author: openshift-merge-bot[bot]

test/extended/machine_config/boot_image_update_agnostic.go

@@ -13,6 +13,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/test/e2e/framework"
+	e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
 )
 
 func AllMachineSetTest(oc *exutil.CLI, fixture string) {
@@ -46,17 +47,18 @@ func PartialMachineSetTest(oc *exutil.CLI, fixture string) {
 	// Label this machineset with the test=boot label
 	err = oc.Run("label").Args(mapiMachinesetQualifiedName, machineSetUnderTest.Name, "-n", mapiNamespace, "test=boot").Execute()
 	o.Expect(err).NotTo(o.HaveOccurred())
-
+	defer func() {
+		// Unlabel the machineset at the end of test
+		err = oc.Run("label").Args(mapiMachinesetQualifiedName, machineSetUnderTest.Name, "-n", mapiNamespace, "test-").Execute()
+		o.Expect(err).NotTo(o.HaveOccurred())
+	}()
 	// Step through all machinesets and verify that only the opted in machineset's boot images are reconciled.
 	machineSets, err := machineClient.MachineV1beta1().MachineSets("openshift-machine-api").List(context.TODO(), metav1.ListOptions{})
 	o.Expect(err).NotTo(o.HaveOccurred())
 	for _, ms := range machineSets.Items {
 		verifyMachineSetUpdate(oc, ms, machineSetUnderTest.Name == ms.Name)
 	}
 
-	// Unlabel the machineset
-	err = oc.Run("label").Args(mapiMachinesetQualifiedName, machineSetUnderTest.Name, "-n", mapiNamespace, "test-").Execute()
-	o.Expect(err).NotTo(o.HaveOccurred())
 }
 
 func NoneMachineSetTest(oc *exutil.CLI, fixture string) {
@@ -76,6 +78,7 @@ func NoneMachineSetTest(oc *exutil.CLI, fixture string) {
 }
 
 func DegradeOnOwnerRefTest(oc *exutil.CLI, fixture string) {
+	e2eskipper.Skipf("This test is temporarily disabled until boot image skew enforcement is implemented")
 	// This fixture applies a boot image update configuration that opts in all machinesets
 	err := oc.Run("apply").Args("-f", fixture).Execute()
 	o.Expect(err).NotTo(o.HaveOccurred())

test/extended/machine_config/boot_image_update_aws.go

@@ -19,6 +19,7 @@ var _ = g.Describe("[sig-mco][OCPFeatureGate:ManagedBootImagesAWS][Serial]", fun
 		partialMachineSetFixture       = filepath.Join(MCOMachineConfigurationBaseDir, "managedbootimages-partial.yaml")
 		allMachineSetFixture           = filepath.Join(MCOMachineConfigurationBaseDir, "managedbootimages-all.yaml")
 		noneMachineSetFixture          = filepath.Join(MCOMachineConfigurationBaseDir, "managedbootimages-none.yaml")
+		emptyMachineSetFixture         = filepath.Join(MCOMachineConfigurationBaseDir, "managedbootimages-empty.yaml")
 		oc                             = exutil.NewCLIWithoutNamespace("machine-config")
 	)
 
@@ -33,7 +34,7 @@ var _ = g.Describe("[sig-mco][OCPFeatureGate:ManagedBootImagesAWS][Serial]", fun
 
 	g.AfterEach(func() {
 		// Clear out boot image configuration between tests
-		err := oc.Run("apply").Args("-f", noneMachineSetFixture).Execute()
+		err := oc.Run("apply").Args("-f", emptyMachineSetFixture).Execute()
 		o.Expect(err).NotTo(o.HaveOccurred())
 	})
 

test/extended/machine_config/boot_image_update_gcp.go

@@ -19,6 +19,7 @@ var _ = g.Describe("[sig-mco][OCPFeatureGate:ManagedBootImages][Serial]", func()
 		partialMachineSetFixture       = filepath.Join(MCOMachineConfigurationBaseDir, "managedbootimages-partial.yaml")
 		allMachineSetFixture           = filepath.Join(MCOMachineConfigurationBaseDir, "managedbootimages-all.yaml")
 		noneMachineSetFixture          = filepath.Join(MCOMachineConfigurationBaseDir, "managedbootimages-none.yaml")
+		emptyMachineSetFixture         = filepath.Join(MCOMachineConfigurationBaseDir, "managedbootimages-empty.yaml")
 		oc                             = exutil.NewCLIWithoutNamespace("machine-config")
 	)
 
@@ -33,7 +34,7 @@ var _ = g.Describe("[sig-mco][OCPFeatureGate:ManagedBootImages][Serial]", func()
 
 	g.AfterEach(func() {
 		// Clear out boot image configuration between tests
-		err := oc.Run("apply").Args("-f", noneMachineSetFixture).Execute()
+		err := oc.Run("apply").Args("-f", emptyMachineSetFixture).Execute()
 		o.Expect(err).NotTo(o.HaveOccurred())
 	})
 

test/extended/machine_config/helpers.go

@@ -98,7 +98,12 @@ func verifyMachineSetUpdate(oc *exutil.CLI, machineSet machinev1beta1.MachineSet
 	newProviderSpecPatch, originalProviderSpecPatch, newBootImage, originalBootImage := createFakeUpdatePatch(oc, machineSet)
 	err := oc.Run("patch").Args(mapiMachinesetQualifiedName, machineSet.Name, "-p", fmt.Sprintf(`{"spec":{"template":{"spec":{"providerSpec":{"value":%s}}}}}`, newProviderSpecPatch), "-n", mapiNamespace, "--type=merge").Execute()
 	o.Expect(err).NotTo(o.HaveOccurred())
-
+	defer func() {
+		// Restore machineSet to original boot image as the machineset may be used by other test variants, regardless of success/fail
+		err = oc.Run("patch").Args(mapiMachinesetQualifiedName, machineSet.Name, "-p", fmt.Sprintf(`{"spec":{"template":{"spec":{"providerSpec":{"value":%s}}}}}`, originalProviderSpecPatch), "-n", mapiNamespace, "--type=merge").Execute()
+		o.Expect(err).NotTo(o.HaveOccurred())
+		framework.Logf("Restored build name in the machineset %s from \"%s\" to \"%s\"", machineSet.Name, newBootImage, originalBootImage)
+	}()
 	// Ensure boot image controller is not progressing
 	framework.Logf("Waiting until the boot image controller is not progressing...")
 	WaitForBootImageControllerToComplete(oc)
@@ -112,12 +117,6 @@ func verifyMachineSetUpdate(oc *exutil.CLI, machineSet machinev1beta1.MachineSet
 		o.Expect(providerSpecDisks).ShouldNot(o.ContainSubstring(newBootImage))
 	} else {
 		o.Expect(providerSpecDisks).Should(o.ContainSubstring(newBootImage))
-		// Restore machineSet to original boot image in this case, as the machineset may be used by other test variants
-
-		o.Expect(err).NotTo(o.HaveOccurred())
-		err = oc.Run("patch").Args(mapiMachinesetQualifiedName, machineSet.Name, "-p", fmt.Sprintf(`{"spec":{"template":{"spec":{"providerSpec":{"value":%s}}}}}`, originalProviderSpecPatch), "-n", mapiNamespace, "--type=merge").Execute()
-		o.Expect(err).NotTo(o.HaveOccurred())
-		framework.Logf("Restored build name in the machineset %s from \"%s\" to \"%s\"", machineSet.Name, originalBootImage, newBootImage)
 	}
 }
 

test/extended/testdata/bindata.go

@@ -0,0 +1,8 @@
+apiVersion: operator.openshift.io/v1
+kind: MachineConfiguration
+metadata:
+  name: cluster
+  namespace: openshift-machine-config-operator
+spec:
+  logLevel: Normal
+  operatorLogLevel: Normal

test/extended/testdata/machine_config/machineconfigurations/managedbootimages-empty.yaml

@@ -6,3 +6,9 @@ metadata:
 spec:
   logLevel: Normal
   operatorLogLevel: Normal
+  managedBootImages:
+    machineManagers:
+      - resource: machinesets
+        apiGroup: machine.openshift.io
+        selection:
+          mode: None