Enable servicing reboot (#760)

* Revert "Disable servicing reboot (#684)"

This reverts commit 68d74ec.

* Revert "Disable servicing reboot unit test"

This reverts commit 36c357e.

* Revert "Disable flatcar node version e2e test"

This reverts commit 7785fa8.

* Revert "Disable servicing controller"

This reverts commit 0e995ef.

Author: jknipper

pkg/controller/servicing/controller_test.go

@@ -241,28 +241,26 @@ func TestServicingControllerReconcile(t *testing.T) {
 			expectedReboot:  false,
 			expectedReplace: true,
 		},
-		/*
-			{
-				message: "Nodes with outdate OS should be rebooted",
-				options: &FakeKlusterOptions{
-					Phase:       models.KlusterPhaseRunning,
-					LastService: nil,
-					NodePools: []FakeNodePoolOptions{
-						{
-							AllowReboot:         true,
-							AllowReplace:        true,
-							NodeHealthy:         true,
-							NodeOSOutdated:      true,
-							NodeKubeletOutdated: false,
-							Size:                1,
-						},
+		{
+			message: "Nodes with outdate OS should be rebooted",
+			options: &FakeKlusterOptions{
+				Phase:       models.KlusterPhaseRunning,
+				LastService: nil,
+				NodePools: []FakeNodePoolOptions{
+					{
+						AllowReboot:         true,
+						AllowReplace:        true,
+						NodeHealthy:         true,
+						NodeOSOutdated:      true,
+						NodeKubeletOutdated: false,
+						Size:                1,
 					},
 				},
-				expectedDrain:   true,
-				expectedReboot:  true,
-				expectedReplace: false,
 			},
-		*/
+			expectedDrain:   true,
+			expectedReboot:  true,
+			expectedReplace: false,
+		},
 		{
 			message: "Up-to-date Node should neither be rebooted nor be replaced",
 			options: &FakeKlusterOptions{

pkg/controller/servicing/reconciler.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/go-kit/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"
@@ -155,8 +154,7 @@ func (r *KlusterReconciler) Do() error {
 
 	update := r.Lister.Updating()
 	replace := r.Lister.Replace()
-	//reboot := r.Lister.Reboot()
-	reboot := make([]*core_v1.Node, 0)
+	reboot := r.Lister.Reboot()
 
 	// The following block retires already updating nodes
 	if len(update) > 0 {

test/e2e/node_test.go

@@ -47,7 +47,7 @@ func (k *NodeTests) Run(t *testing.T) {
 	_ = t.Run("Created", k.StateRunning) &&
 		t.Run("Tagged", k.Tagged) &&
 		t.Run("Registered", k.Registered) &&
-		//t.Run("LatestContainerLinux", k.LatestContainerLinux) &&
+		t.Run("LatestContainerLinux", k.LatestContainerLinux) &&
 		t.Run("Schedulable", k.StateSchedulable) &&
 		t.Run("NetworkUnavailable", k.ConditionNetworkUnavailable) &&
 		t.Run("Healthy", k.StateHealthy) &&