rancher/norman
1
0
Fork 0
mirror of https://github.com/rancher/norman.git synced 2025-09-19 01:17:04 +00:00
Code Issues Releases Wiki Activity

Refactor k8s startup to return ClientConfig

Browse Source
This commit is contained in:
Darren Shepherd
2020-02-12 14:04:31 -07:00
parent fc45a55d4d
commit 732b9611fa
2 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/kwrapper/k8s/k3s_linux.go
View File

@@ -12,7 +12,6 @@ import (
"github.com/rancher/norman/pkg/kwrapper/etcd"
"github.com/sirupsen/logrus"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
)
@@ -20,26 +19,26 @@ var (
kubeConfig = ".kube/k3s.yaml"
)
func getEmbedded(ctx context.Context) (bool, context.Context, *rest.Config, error) {
func getEmbedded(ctx context.Context) (bool, clientcmd.ClientConfig, error) {
var (
err error
)
etcdEndpoints, err := etcd.RunETCD(ctx, "./management-state")
if err != nil {
return false, ctx, nil, err
return false, nil, err
}
kubeConfig, err := k3sServer(ctx, etcdEndpoints)
if err != nil {
return false, ctx, nil, err
return false, nil, err
}
os.Setenv("KUBECONFIG", kubeConfig)
restConfig, err := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
&clientcmd.ClientConfigLoadingRules{ExplicitPath: kubeConfig}, &clientcmd.ConfigOverrides{}).ClientConfig()
clientConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
&clientcmd.ClientConfigLoadingRules{ExplicitPath: kubeConfig}, &clientcmd.ConfigOverrides{})
return true, ctx, restConfig, err
return true, clientConfig, nil
}
func k3sServer(ctx context.Context, endpoints []string) (string, error) {