From 3da1bb3af2ed0a3ef06cc69bef8aaed42112ea7f Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Fri, 29 Oct 2021 11:39:27 -0700 Subject: [PATCH] Fix other uses of NewForConfigOrDie in contexts where we could return err Signed-off-by: Brad Davidson --- pkg/daemons/control/server.go | 5 ++++- pkg/server/context.go | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/daemons/control/server.go b/pkg/daemons/control/server.go index 25f5dfd368..2724d7f3d6 100644 --- a/pkg/daemons/control/server.go +++ b/pkg/daemons/control/server.go @@ -347,7 +347,10 @@ func checkForCloudControllerPrivileges(ctx context.Context, runtime *config.Cont if err != nil { return err } - authClient := authorizationv1client.NewForConfigOrDie(restConfig) + authClient, err := authorizationv1client.NewForConfig(restConfig) + if err != nil { + return err + } sar := &authorizationv1.SubjectAccessReview{ Spec: authorizationv1.SubjectAccessReviewSpec{ User: version.Program + "-cloud-controller-manager", diff --git a/pkg/server/context.go b/pkg/server/context.go index 2c1fa9fcbb..25cf3b2775 100644 --- a/pkg/server/context.go +++ b/pkg/server/context.go @@ -60,7 +60,10 @@ func NewContext(ctx context.Context, cfg string) (*Context, error) { return nil, errors.Wrap(err, "failed to register CRDs") } - k8s := kubernetes.NewForConfigOrDie(restConfig) + k8s, err := kubernetes.NewForConfig(restConfig) + if err != nil { + return nil, err + } return &Context{ K3s: k3s.NewFactoryFromConfigOrDie(restConfig), Helm: helm.NewFactoryFromConfigOrDie(restConfig),