From 89bafb2fed6b264e385f774ab11320c9dd9d9f5c Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Wed, 1 May 2024 20:08:04 +0200 Subject: [PATCH] controlplane/apiserver: unify options package name Signed-off-by: Dr. Stefan Schimanski --- pkg/controlplane/apiserver/aggregator.go | 4 ++-- pkg/controlplane/apiserver/apiextensions.go | 4 ++-- pkg/controlplane/apiserver/config.go | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/controlplane/apiserver/aggregator.go b/pkg/controlplane/apiserver/aggregator.go index 2622d1db681..61acedb4b73 100644 --- a/pkg/controlplane/apiserver/aggregator.go +++ b/pkg/controlplane/apiserver/aggregator.go @@ -45,13 +45,13 @@ import ( informers "k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1" "k8s.io/kube-aggregator/pkg/controllers/autoregister" - controlplaneapiserver "k8s.io/kubernetes/pkg/controlplane/apiserver/options" + "k8s.io/kubernetes/pkg/controlplane/apiserver/options" "k8s.io/kubernetes/pkg/controlplane/controller/crdregistration" ) func CreateAggregatorConfig( kubeAPIServerConfig genericapiserver.Config, - commandOptions controlplaneapiserver.CompletedOptions, + commandOptions options.CompletedOptions, externalInformers kubeexternalinformers.SharedInformerFactory, serviceResolver aggregatorapiserver.ServiceResolver, proxyTransport *http.Transport, diff --git a/pkg/controlplane/apiserver/apiextensions.go b/pkg/controlplane/apiserver/apiextensions.go index 2b4fb0ade0b..d203d2757e3 100644 --- a/pkg/controlplane/apiserver/apiextensions.go +++ b/pkg/controlplane/apiserver/apiextensions.go @@ -28,14 +28,14 @@ import ( "k8s.io/apiserver/pkg/util/webhook" "k8s.io/client-go/informers" - controlplaneapiserver "k8s.io/kubernetes/pkg/controlplane/apiserver/options" + "k8s.io/kubernetes/pkg/controlplane/apiserver/options" ) func CreateAPIExtensionsConfig( kubeAPIServerConfig server.Config, kubeInformers informers.SharedInformerFactory, pluginInitializers []admission.PluginInitializer, - commandOptions controlplaneapiserver.CompletedOptions, + commandOptions options.CompletedOptions, masterCount int, serviceResolver webhook.ServiceResolver, authResolverWrapper webhook.AuthenticationInfoResolverWrapper, diff --git a/pkg/controlplane/apiserver/config.go b/pkg/controlplane/apiserver/config.go index 924a3f4685d..127edc55e06 100644 --- a/pkg/controlplane/apiserver/config.go +++ b/pkg/controlplane/apiserver/config.go @@ -52,7 +52,7 @@ import ( "k8s.io/kubernetes/pkg/api/legacyscheme" controlplaneadmission "k8s.io/kubernetes/pkg/controlplane/apiserver/admission" - controlplaneapiserver "k8s.io/kubernetes/pkg/controlplane/apiserver/options" + "k8s.io/kubernetes/pkg/controlplane/apiserver/options" "k8s.io/kubernetes/pkg/controlplane/controller/clusterauthenticationtrust" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubeapiserver" @@ -107,7 +107,7 @@ type Extra struct { // the genericapiserver.Config associated with it. The genericapiserver.Config is // often shared between multiple delegated apiservers. func BuildGenericConfig( - s controlplaneapiserver.CompletedOptions, + s options.CompletedOptions, schemes []*runtime.Scheme, resourceConfig *serverstorage.ResourceConfig, getOpenAPIDefinitions func(ref openapicommon.ReferenceCallback) map[string]openapicommon.OpenAPIDefinition, @@ -233,7 +233,7 @@ func BuildGenericConfig( } // BuildAuthorizer constructs the authorizer. If authorization is not set in s, it returns nil, nil, false, nil -func BuildAuthorizer(ctx context.Context, s controlplaneapiserver.CompletedOptions, egressSelector *egressselector.EgressSelector, apiserverID string, versionedInformers clientgoinformers.SharedInformerFactory) (authorizer.Authorizer, authorizer.RuleResolver, bool, error) { +func BuildAuthorizer(ctx context.Context, s options.CompletedOptions, egressSelector *egressselector.EgressSelector, apiserverID string, versionedInformers clientgoinformers.SharedInformerFactory) (authorizer.Authorizer, authorizer.RuleResolver, bool, error) { authorizationConfig, err := s.Authorization.ToAuthorizationConfig(versionedInformers) if err != nil { return nil, nil, false, err @@ -266,7 +266,7 @@ func BuildAuthorizer(ctx context.Context, s controlplaneapiserver.CompletedOptio // CreateConfig takes the generic controlplane apiserver options and // creates a config for the generic Kube APIs out of it. func CreateConfig( - opts controlplaneapiserver.CompletedOptions, + opts options.CompletedOptions, genericConfig *genericapiserver.Config, versionedInformers clientgoinformers.SharedInformerFactory, storageFactory *serverstorage.DefaultStorageFactory,