github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

controlplane/apiserver: unify options package name

Browse Source 
Signed-off-by: Dr. Stefan Schimanski <stefan.schimanski@gmail.com>
This commit is contained in:
Dr. Stefan Schimanski
2024-05-01 20:08:04 +02:00
parent 1aa24b0951
commit 89bafb2fed
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controlplane/apiserver/aggregator.go
View File

@@ -45,13 +45,13 @@ import (
informers "k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1" informers "k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1"
"k8s.io/kube-aggregator/pkg/controllers/autoregister" "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" "k8s.io/kubernetes/pkg/controlplane/controller/crdregistration"
) )
func CreateAggregatorConfig( func CreateAggregatorConfig(
kubeAPIServerConfig genericapiserver.Config, kubeAPIServerConfig genericapiserver.Config,
commandOptions controlplaneapiserver.CompletedOptions, commandOptions options.CompletedOptions,
externalInformers kubeexternalinformers.SharedInformerFactory, externalInformers kubeexternalinformers.SharedInformerFactory,
serviceResolver aggregatorapiserver.ServiceResolver, serviceResolver aggregatorapiserver.ServiceResolver,
proxyTransport *http.Transport, proxyTransport *http.Transport,

4
pkg/controlplane/apiserver/apiextensions.go
View File

@@ -28,14 +28,14 @@ import (
"k8s.io/apiserver/pkg/util/webhook" "k8s.io/apiserver/pkg/util/webhook"
"k8s.io/client-go/informers" "k8s.io/client-go/informers"
controlplaneapiserver "k8s.io/kubernetes/pkg/controlplane/apiserver/options" "k8s.io/kubernetes/pkg/controlplane/apiserver/options"
) )
func CreateAPIExtensionsConfig( func CreateAPIExtensionsConfig(
kubeAPIServerConfig server.Config, kubeAPIServerConfig server.Config,
kubeInformers informers.SharedInformerFactory, kubeInformers informers.SharedInformerFactory,
pluginInitializers []admission.PluginInitializer, pluginInitializers []admission.PluginInitializer,
commandOptions controlplaneapiserver.CompletedOptions, commandOptions options.CompletedOptions,
masterCount int, masterCount int,
serviceResolver webhook.ServiceResolver, serviceResolver webhook.ServiceResolver,
authResolverWrapper webhook.AuthenticationInfoResolverWrapper, authResolverWrapper webhook.AuthenticationInfoResolverWrapper,

8
pkg/controlplane/apiserver/config.go
View File

@@ -52,7 +52,7 @@ import (
"k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/api/legacyscheme"
controlplaneadmission "k8s.io/kubernetes/pkg/controlplane/apiserver/admission" 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/controlplane/controller/clusterauthenticationtrust"
"k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/kubeapiserver" "k8s.io/kubernetes/pkg/kubeapiserver"
@@ -107,7 +107,7 @@ type Extra struct {
// the genericapiserver.Config associated with it. The genericapiserver.Config is // the genericapiserver.Config associated with it. The genericapiserver.Config is
// often shared between multiple delegated apiservers. // often shared between multiple delegated apiservers.
func BuildGenericConfig( func BuildGenericConfig(
s controlplaneapiserver.CompletedOptions, s options.CompletedOptions,
schemes []*runtime.Scheme, schemes []*runtime.Scheme,
resourceConfig *serverstorage.ResourceConfig, resourceConfig *serverstorage.ResourceConfig,
getOpenAPIDefinitions func(ref openapicommon.ReferenceCallback) map[string]openapicommon.OpenAPIDefinition, 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 // 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) authorizationConfig, err := s.Authorization.ToAuthorizationConfig(versionedInformers)
if err != nil { if err != nil {
return nil, nil, false, err 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 // CreateConfig takes the generic controlplane apiserver options and
// creates a config for the generic Kube APIs out of it. // creates a config for the generic Kube APIs out of it.
func CreateConfig( func CreateConfig(
opts controlplaneapiserver.CompletedOptions, opts options.CompletedOptions,
genericConfig *genericapiserver.Config, genericConfig *genericapiserver.Config,
versionedInformers clientgoinformers.SharedInformerFactory, versionedInformers clientgoinformers.SharedInformerFactory,
storageFactory *serverstorage.DefaultStorageFactory, storageFactory *serverstorage.DefaultStorageFactory,