From b115df227abb2399bd54904de83483cd601d632d Mon Sep 17 00:00:00 2001 From: Jiahui Feng Date: Wed, 28 Feb 2024 15:56:14 -0800 Subject: [PATCH] update tests due to change of NewPluginInitializer. --- pkg/kubeapiserver/admission/initializer_test.go | 7 +++---- plugin/pkg/admission/gc/gc_admission_test.go | 2 +- plugin/pkg/admission/resourcequota/admission_test.go | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkg/kubeapiserver/admission/initializer_test.go b/pkg/kubeapiserver/admission/initializer_test.go index ead0a2e3f25..f4fa85e812c 100644 --- a/pkg/kubeapiserver/admission/initializer_test.go +++ b/pkg/kubeapiserver/admission/initializer_test.go @@ -24,7 +24,6 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/admission" quota "k8s.io/apiserver/pkg/quota/v1" - "k8s.io/kubernetes/pkg/kubeapiserver/admission/exclusion" ) type doNothingAdmission struct{} @@ -50,7 +49,7 @@ func (p *WantsCloudConfigAdmissionPlugin) SetCloudConfig(cloudConfig []byte) { func TestCloudConfigAdmissionPlugin(t *testing.T) { cloudConfig := []byte("cloud-configuration") - initializer := NewPluginInitializer(cloudConfig, nil, nil, exclusion.NewFilter()) + initializer := NewPluginInitializer(cloudConfig, nil, nil, nil) wantsCloudConfigAdmission := &WantsCloudConfigAdmissionPlugin{} initializer.Initialize(wantsCloudConfigAdmission) @@ -95,7 +94,7 @@ func (p *WantsRESTMapperAdmissionPlugin) SetRESTMapper(mapper meta.RESTMapper) { func TestRESTMapperAdmissionPlugin(t *testing.T) { mapper := doNothingRESTMapper{} - initializer := NewPluginInitializer(nil, mapper, nil, exclusion.NewFilter()) + initializer := NewPluginInitializer(nil, mapper, nil, nil) wantsRESTMapperAdmission := &WantsRESTMapperAdmissionPlugin{} initializer.Initialize(wantsRESTMapperAdmission) @@ -122,7 +121,7 @@ func (p *WantsQuotaConfigurationAdmissionPlugin) SetQuotaConfiguration(config qu func TestQuotaConfigurationAdmissionPlugin(t *testing.T) { config := doNothingQuotaConfiguration{} - initializer := NewPluginInitializer(nil, nil, config, exclusion.NewFilter()) + initializer := NewPluginInitializer(nil, nil, config, nil) wantsQuotaConfigurationAdmission := &WantsQuotaConfigurationAdmissionPlugin{} initializer.Initialize(wantsQuotaConfigurationAdmission) diff --git a/plugin/pkg/admission/gc/gc_admission_test.go b/plugin/pkg/admission/gc/gc_admission_test.go index d32c7cd2504..889162e29f0 100644 --- a/plugin/pkg/admission/gc/gc_admission_test.go +++ b/plugin/pkg/admission/gc/gc_admission_test.go @@ -139,7 +139,7 @@ func newGCPermissionsEnforcement() (*gcPermissionsEnforcement, error) { return nil, fmt.Errorf("unexpected error while constructing resource list from fake discovery client: %v", err) } restMapper := restmapper.NewDiscoveryRESTMapper(restMapperRes) - pluginInitializer := kubeadmission.NewPluginInitializer(nil, restMapper, nil) + pluginInitializer := kubeadmission.NewPluginInitializer(nil, restMapper, nil, nil) initializersChain := admission.PluginInitializers{} initializersChain = append(initializersChain, genericPluginInitializer) initializersChain = append(initializersChain, pluginInitializer) diff --git a/plugin/pkg/admission/resourcequota/admission_test.go b/plugin/pkg/admission/resourcequota/admission_test.go index c389dcb2a1c..23cdc4df239 100644 --- a/plugin/pkg/admission/resourcequota/admission_test.go +++ b/plugin/pkg/admission/resourcequota/admission_test.go @@ -115,7 +115,7 @@ func createHandlerWithConfig(kubeClient kubernetes.Interface, informerFactory in initializers := admission.PluginInitializers{ genericadmissioninitializer.New(kubeClient, nil, informerFactory, nil, nil, stopCh), - kubeapiserveradmission.NewPluginInitializer(nil, nil, quotaConfiguration), + kubeapiserveradmission.NewPluginInitializer(nil, nil, quotaConfiguration, nil), } initializers.Initialize(handler)