karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2651 from RainbowMango/pr_cleanup_customize_interpreter 

cleanup kubeconfig parameter from customized interpreter
This commit is contained in:
karmada-bot 2022-10-20 09:08:15 +08:00 committed by GitHub
parent 7aa94c5be9 f5d3d013e6
commit 900a1bb043
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/agent/app/agent.go
View File

@ -221,7 +221,7 @@ func setupControllers(mgr controllerruntime.Manager, opts *options.Options, stop
restConfig := mgr.GetConfig()
dynamicClientSet := dynamic.NewForConfigOrDie(restConfig)
controlPlaneInformerManager := genericmanager.NewSingleClusterInformerManager(dynamicClientSet, 0, stopChan)
resourceInterpreter := resourceinterpreter.NewResourceInterpreter("", controlPlaneInformerManager)
resourceInterpreter := resourceinterpreter.NewResourceInterpreter(controlPlaneInformerManager)
if err := mgr.Add(resourceInterpreter); err != nil {
return fmt.Errorf("failed to setup custom resource interpreter: %w", err)
}

2
cmd/controller-manager/app/controllermanager.go
View File

@ -511,7 +511,7 @@ func setupControllers(mgr controllerruntime.Manager, opts *options.Options, stop
controlPlaneInformerManager := genericmanager.NewSingleClusterInformerManager(dynamicClientSet, 0, stopChan)
resourceInterpreter := resourceinterpreter.NewResourceInterpreter("", controlPlaneInformerManager)
resourceInterpreter := resourceinterpreter.NewResourceInterpreter(controlPlaneInformerManager)
if err := mgr.Add(resourceInterpreter); err != nil {
klog.Fatalf("Failed to setup custom resource interpreter: %v", err)
}

14
pkg/resourceinterpreter/customizedinterpreter/customized.go
View File

@ -26,12 +26,14 @@ import (
// CustomizedInterpreter interpret custom resource with webhook configuration.
type CustomizedInterpreter struct {
hookManager configmanager.ConfigManager
configManager *webhookutil.ClientManager
// hookManager caches all webhook configurations.
hookManager configmanager.ConfigManager
// clientManager builds REST clients to talk to webhooks.
clientManager *webhookutil.ClientManager
}
// NewCustomizedInterpreter return a new CustomizedInterpreter.
func NewCustomizedInterpreter(kubeconfig string, informer genericmanager.SingleClusterInformerManager) (*CustomizedInterpreter, error) {
func NewCustomizedInterpreter(informer genericmanager.SingleClusterInformerManager) (*CustomizedInterpreter, error) {
cm, err := webhookutil.NewClientManager(
[]schema.GroupVersion{configv1alpha1.SchemeGroupVersion},
configv1alpha1.AddToScheme,
@ -39,7 +41,7 @@ func NewCustomizedInterpreter(kubeconfig string, informer genericmanager.SingleC
if err != nil {
return nil, err
}
authInfoResolver, err := webhookutil.NewDefaultAuthenticationInfoResolver(kubeconfig)
authInfoResolver, err := webhookutil.NewDefaultAuthenticationInfoResolver("")
if err != nil {
return nil, err
}
@ -48,7 +50,7 @@ func NewCustomizedInterpreter(kubeconfig string, informer genericmanager.SingleC
return &CustomizedInterpreter{
hookManager: configmanager.NewExploreConfigManager(informer),
configManager: &cm,
clientManager: &cm,
}, nil
}
@ -184,7 +186,7 @@ func (e *CustomizedInterpreter) callHook(ctx context.Context, hook configmanager
}
}
client, err := hook.GetRESTClient(e.configManager)
client, err := hook.GetRESTClient(e.clientManager)
if err != nil {
return nil, &webhookutil.ErrCallingWebhook{
WebhookName: hook.GetUID(),

10
pkg/resourceinterpreter/interpreter.go
View File

@ -49,16 +49,14 @@ type ResourceInterpreter interface {
}
// NewResourceInterpreter builds a new ResourceInterpreter object.
func NewResourceInterpreter(kubeconfig string, informer genericmanager.SingleClusterInformerManager) ResourceInterpreter {
func NewResourceInterpreter(informer genericmanager.SingleClusterInformerManager) ResourceInterpreter {
return &customResourceInterpreterImpl{
kubeconfig: kubeconfig,
informer: informer,
informer: informer,
}
}
type customResourceInterpreterImpl struct {
kubeconfig string
informer genericmanager.SingleClusterInformerManager
informer genericmanager.SingleClusterInformerManager
customizedInterpreter *customizedinterpreter.CustomizedInterpreter
defaultInterpreter *defaultinterpreter.DefaultInterpreter
@ -68,7 +66,7 @@ type customResourceInterpreterImpl struct {
func (i *customResourceInterpreterImpl) Start(ctx context.Context) (err error) {
klog.Infof("Starting custom resource interpreter.")
i.customizedInterpreter, err = customizedinterpreter.NewCustomizedInterpreter(i.kubeconfig, i.informer)
i.customizedInterpreter, err = customizedinterpreter.NewCustomizedInterpreter(i.informer)
if err != nil {
return
}