Skip to content

Commit

Permalink
Move clusterID retrieval into its own helper method
Browse files Browse the repository at this point in the history
Signed-off-by: Tom Wieczorek <[email protected]>
  • Loading branch information
twz123 committed Sep 24, 2024
1 parent e83c857 commit cc1d8d4
Showing 1 changed file with 16 additions and 7 deletions.
23 changes: 16 additions & 7 deletions pkg/autopilot/controller/root_worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand All @@ -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
}

0 comments on commit cc1d8d4

Please sign in to comment.