From 914729cc05cdfb5f9bac3618871e03f1f4565b16 Mon Sep 17 00:00:00 2001 From: Jan Knipper Date: Tue, 17 Dec 2024 14:54:26 +0100 Subject: [PATCH 1/2] Disable OS updates during xmas --- pkg/controller/servicing/reconciler.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/controller/servicing/reconciler.go b/pkg/controller/servicing/reconciler.go index 890b1e365f..e8837efa18 100644 --- a/pkg/controller/servicing/reconciler.go +++ b/pkg/controller/servicing/reconciler.go @@ -5,6 +5,7 @@ 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" @@ -157,7 +158,8 @@ func (r *KlusterReconciler) Do() error { update := r.Lister.Updating() replace := r.Lister.Replace() - reboot := r.Lister.Reboot() + // reboot := r.Lister.Reboot() + reboot := make([]*core_v1.Node, 0) // disable reboots for now // The following block retires already updating nodes if len(update) > 0 { From 290bc4a9460693f0802a317ba00e413f92f5f821 Mon Sep 17 00:00:00 2001 From: Jan Knipper Date: Tue, 17 Dec 2024 15:38:02 +0100 Subject: [PATCH 2/2] Disable tests --- pkg/controller/servicing/controller_test.go | 22 +++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkg/controller/servicing/controller_test.go b/pkg/controller/servicing/controller_test.go index 65a876ec08..c194d8671e 100644 --- a/pkg/controller/servicing/controller_test.go +++ b/pkg/controller/servicing/controller_test.go @@ -341,17 +341,19 @@ 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])