Revert "Disable OS updates during xmas (#968)" (#969)

This reverts commit 5b41e45.
sapcc · Jan 6, 2025 · 63c3d39 · 63c3d39
1 parent 5b41e45
commit 63c3d39
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/pkg/controller/servicing/controller_test.go b/pkg/controller/servicing/controller_test.go
@@ -341,19 +341,17 @@ func TestServicingControllerReconcile(t *testing.T) {
 			}
 
 			_, err := controller.Reconcile(kluster)
-			/*
-				if subject.expectedDrain {
-					mockCycler.AssertCalled(t, "Drain", nodes[0])
-				} else {
-					mockCycler.AssertNotCalled(t, "Drain")
-				}
+			if subject.expectedDrain {
+				mockCycler.AssertCalled(t, "Drain", nodes[0])
+			} else {
+				mockCycler.AssertNotCalled(t, "Drain")
+			}
 
-				if subject.expectedReboot {
-					mockCycler.AssertCalled(t, "Reboot", nodes[0])
-				} else {
-					mockCycler.AssertNotCalled(t, "Reboot")
-				}
-			*/
+			if subject.expectedReboot {
+				mockCycler.AssertCalled(t, "Reboot", nodes[0])
+			} else {
+				mockCycler.AssertNotCalled(t, "Reboot")
+			}
 
 			if subject.expectedReplace {
 				mockCycler.AssertCalled(t, "Replace", nodes[0])

diff --git a/pkg/controller/servicing/reconciler.go b/pkg/controller/servicing/reconciler.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/pkg/errors"
-	core_v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/record"
 
 	"github.com/sapcc/kubernikus/pkg/api/models"
@@ -158,8 +157,7 @@ func (r *KlusterReconciler) Do() error {
 
 	update := r.Lister.Updating()
 	replace := r.Lister.Replace()
-	// reboot := r.Lister.Reboot()
-	reboot := make([]*core_v1.Node, 0) // disable reboots for now
+	reboot := r.Lister.Reboot()
 
 	// The following block retires already updating nodes
 	if len(update) > 0 {