Use exclusive system-upgrade-controller plans

Signed-off-by: Andrea Mazzotti <andrea.mazzotti@suse.com>
rancher · Oct 24, 2024 · bc854a6 · bc854a6
1 parent 2895237
commit bc854a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/controllers/managedosimage_controller.go b/controllers/managedosimage_controller.go
@@ -339,6 +339,7 @@ func (r *ManagedOSImageReconciler) newFleetBundleResources(ctx context.Context,
 				Tolerations: []corev1.Toleration{{
 					Operator: corev1.TolerationOpExists,
 				}},
+				Exclusive:          true,
 				ServiceAccountName: uniqueName,
 				NodeSelector:       selector,
 				Cordon:             cordon,

diff --git a/controllers/managedosimage_controller_test.go b/controllers/managedosimage_controller_test.go
@@ -138,7 +138,7 @@ var _ = Describe("newFleetBundleResources", func() {
 		Expect(bundleResources[1].Name).To(Equal("ClusterRoleBinding--os-upgrader-test-name-cc7ce4275b54.yaml"))
 		Expect(bundleResources[2].Name).To(Equal("ServiceAccount-cattle-system-os-upgrader-test-name-08929531f5c0.yaml"))
 		Expect(bundleResources[3].Name).To(Equal("Secret-cattle-system-os-upgrader-test-name-52e9d8e041f4.yaml"))
-		Expect(bundleResources[4].Name).To(Equal("Plan-cattle-system-os-upgrader-test-name-2663ce8e6968.yaml"))
+		Expect(bundleResources[4].Name).To(Equal("Plan-cattle-system-os-upgrader-test-name-6c067d188526.yaml"))
 	})
 
 	It("should create fleet bundle when managedOSVersion exists", func() {
@@ -170,7 +170,7 @@ var _ = Describe("newFleetBundleResources", func() {
 		Expect(bundleResources[1].Name).To(Equal("ClusterRoleBinding--os-upgrader-test-name-cc7ce4275b54.yaml"))
 		Expect(bundleResources[2].Name).To(Equal("ServiceAccount-cattle-system-os-upgrader-test-name-08929531f5c0.yaml"))
 		Expect(bundleResources[3].Name).To(Equal("Secret-cattle-system-os-upgrader-test-name-52e9d8e041f4.yaml"))
-		Expect(bundleResources[4].Name).To(Equal("Plan-cattle-system-os-upgrader-test-name-2663ce8e6968.yaml"))
+		Expect(bundleResources[4].Name).To(Equal("Plan-cattle-system-os-upgrader-test-name-6c067d188526.yaml"))
 	})
 })