Fix: crd client support kubeconfig (#7)

huiwq1990 · web-flow · commit 340c9f21a71b · 2023-03-31T16:13:13.000+08:00
Signed-off-by: huiwq1990 &lt;huiwq1990@163.com&gt;
diff --git a/pkg/k8s/k8s.go b/pkg/k8s/k8s.go
@@ -12,7 +12,6 @@ import (
 	k8sruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
-	ctr "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	oamapi "github.com/oam-dev/kubevela-core-api/apis/core.oam.dev"
@@ -49,7 +48,7 @@ func New(kubeconfig string) *k8s {
 		log.WithError(err).Fatal("error creating kubernetes client")
 	}
 
-	cc, err := client.New(ctr.GetConfigOrDie(), client.Options{Scheme: Scheme})
+	cc, err := client.New(config, client.Options{Scheme: Scheme})
 	if err != nil {
 		log.WithError(err).Fatal("error creating controller runtime client")
 	}

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ import (`
`12`	`12`	`k8sruntime "k8s.io/apimachinery/pkg/runtime"`
`13`	`13`	`"k8s.io/client-go/kubernetes"`
`14`	`14`	`"k8s.io/client-go/tools/clientcmd"`
`15`		`- ctr "sigs.k8s.io/controller-runtime"`
`16`	`15`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`17`	`16`
`18`	`17`	`oamapi "github.com/oam-dev/kubevela-core-api/apis/core.oam.dev"`
`@@ -49,7 +48,7 @@ func New(kubeconfig string) *k8s {`
`49`	`48`	`log.WithError(err).Fatal("error creating kubernetes client")`
`50`	`49`	`}`
`51`	`50`
`52`		`- cc, err := client.New(ctr.GetConfigOrDie(), client.Options{Scheme: Scheme})`
	`51`	`+ cc, err := client.New(config, client.Options{Scheme: Scheme})`
`53`	`52`	`if err != nil {`
`54`	`53`	`log.WithError(err).Fatal("error creating controller runtime client")`
`55`	`54`	`}`