From cc1d8d47c1e8cffe18509020d74fe924617a9fe8 Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Tue, 24 Sep 2024 15:28:11 +0200 Subject: [PATCH] Move clusterID retrieval into its own helper method Signed-off-by: Tom Wieczorek --- pkg/autopilot/controller/root_worker.go | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkg/autopilot/controller/root_worker.go b/pkg/autopilot/controller/root_worker.go index abc15fd1020b..88417920c7cb 100644 --- a/pkg/autopilot/controller/root_worker.go +++ b/pkg/autopilot/controller/root_worker.go @@ -24,7 +24,7 @@ import ( aproot "github.com/k0sproject/k0s/pkg/autopilot/controller/root" apsig "github.com/k0sproject/k0s/pkg/autopilot/controller/signal" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" k8sretry "k8s.io/client-go/util/retry" cr "sigs.k8s.io/controller-runtime" @@ -94,15 +94,10 @@ func (w *rootWorker) Run(ctx context.Context) error { }, func(err error) bool { return true }, func() error { - cl, err := w.clientFactory.GetClient() + clusterID, err := w.getClusterID(ctx) if err != nil { return err } - ns, err := cl.CoreV1().Namespaces().Get(ctx, "kube-system", v1.GetOptions{}) - if err != nil { - return err - } - clusterID := string(ns.UID) if err := RegisterIndexers(ctx, mgr, "worker"); err != nil { return fmt.Errorf("unable to register indexers: %w", err) @@ -118,3 +113,17 @@ func (w *rootWorker) Run(ctx context.Context) error { return nil }) } + +func (w *rootWorker) getClusterID(ctx context.Context) (string, error) { + client, err := w.clientFactory.GetClient() + if err != nil { + return "", err + } + + namespace, err := client.CoreV1().Namespaces().Get(ctx, "kube-system", metav1.GetOptions{}) + if err != nil { + return "", err + } + + return string(namespace.UID), nil +}