public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-07-28 21:59:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix other uses of NewForConfigOrDie in contexts where we could return err

Browse Source 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
Brad Davidson
2021-10-29 11:39:27 -07:00
committed by Brad Davidson
parent 5acd0b9008
commit 3da1bb3af2
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/daemons/control/server.go
View File

@@ -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",

5
pkg/server/context.go
View File

@@ -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),