fix client-go rest config not work

This commit is contained in:
shiyan2016 2020-12-01 19:00:43 +08:00 committed by Siyu Wang
parent 59a6e200ee
commit 2fa060a98e
2 changed files with 7 additions and 7 deletions

View File

@ -38,6 +38,7 @@ import (
appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1"
appsv1beta1 "github.com/openkruise/kruise/apis/apps/v1beta1"
"github.com/openkruise/kruise/pkg/controller"
"github.com/openkruise/kruise/pkg/util/gate"
// +kubebuilder:scaffold:imports
)
@ -100,7 +101,9 @@ func main() {
cfg := ctrl.GetConfigOrDie()
setRestConfig(cfg)
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
gate.Init(cfg)
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
Scheme: scheme,
MetricsBindAddress: metricsAddr,
HealthProbeBindAddress: healthProbeAddr,

View File

@ -27,10 +27,10 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/client-go/discovery"
"k8s.io/client-go/rest"
"k8s.io/client-go/util/retry"
"k8s.io/klog"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
"sigs.k8s.io/controller-runtime/pkg/client/config"
)
const (
@ -44,12 +44,9 @@ var (
isNotNotFound = func(err error) bool { return !errors.IsNotFound(err) }
)
func init() {
func Init(cfg *rest.Config) {
_ = apis.AddToScheme(internalScheme)
cfg, err := config.GetConfig()
if err == nil {
discoveryClient = discovery.NewDiscoveryClientForConfigOrDie(cfg)
}
discoveryClient = discovery.NewDiscoveryClientForConfigOrDie(cfg)
}
// ResourceEnabled help runnable check if the custom resource is valid and enabled