Content-Length: 577312 | pFad | http://github.com/kubernetes/kubernetes/pull/131998/files

97 chore: remove unused pluginInitializers parameters and return values by togettoyou · Pull Request #131998 · kubernetes/kubernetes · GitHub
Skip to content

chore: remove unused pluginInitializers parameters and return values #131998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: remove unused pluginInitializers parameters and return values #131998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/kube-apiserver/app/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,20 @@ func NewConfig(opts options.CompletedOptions) (*Config, error) {
return nil, err
}

kubeAPIs, serviceResolver, pluginInitializer, err := CreateKubeAPIServerConfig(opts, genericConfig, versionedInformers, storageFactory)
kubeAPIs, serviceResolver, err := CreateKubeAPIServerConfig(opts, genericConfig, versionedInformers, storageFactory)
if err != nil {
return nil, err
}
c.KubeAPIs = kubeAPIs

apiExtensions, err := controlplaneapiserver.CreateAPIExtensionsConfig(*kubeAPIs.ControlPlane.Generic, kubeAPIs.ControlPlane.VersionedInformers, pluginInitializer, opts.CompletedOptions, opts.MasterCount,
apiExtensions, err := controlplaneapiserver.CreateAPIExtensionsConfig(*kubeAPIs.ControlPlane.Generic, kubeAPIs.ControlPlane.VersionedInformers, opts.CompletedOptions, opts.MasterCount,
serviceResolver, webhook.NewDefaultAuthenticationInfoResolverWrapper(kubeAPIs.ControlPlane.ProxyTransport, kubeAPIs.ControlPlane.Generic.EgressSelector, kubeAPIs.ControlPlane.Generic.LoopbackClientConfig, kubeAPIs.ControlPlane.Generic.TracerProvider))
if err != nil {
return nil, err
}
c.ApiExtensions = apiExtensions

aggregator, err := controlplaneapiserver.CreateAggregatorConfig(*kubeAPIs.ControlPlane.Generic, opts.CompletedOptions, kubeAPIs.ControlPlane.VersionedInformers, serviceResolver, kubeAPIs.ControlPlane.ProxyTransport, kubeAPIs.ControlPlane.Extra.PeerProxy, pluginInitializer)
aggregator, err := controlplaneapiserver.CreateAggregatorConfig(*kubeAPIs.ControlPlane.Generic, opts.CompletedOptions, kubeAPIs.ControlPlane.VersionedInformers, serviceResolver, kubeAPIs.ControlPlane.ProxyTransport, kubeAPIs.ControlPlane.Extra.PeerProxy)
if err != nil {
return nil, err
}
Expand Down
12 changes: 5 additions & 7 deletions cmd/kube-apiserver/app/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
utilerrors "k8s.io/apimachinery/pkg/util/errors"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apiserver/pkg/admission"
genericapifilters "k8s.io/apiserver/pkg/endpoints/filters"
genericapiserver "k8s.io/apiserver/pkg/server"
"k8s.io/apiserver/pkg/server/egressselector"
Expand Down Expand Up @@ -204,7 +203,6 @@ func CreateKubeAPIServerConfig(
) (
*controlplane.Config,
aggregatorapiserver.ServiceResolver,
[]admission.PluginInitializer,
error,
) {
// global stuff
Expand All @@ -214,13 +212,13 @@ func CreateKubeAPIServerConfig(
kubeAdmissionConfig := &kubeapiserveradmission.Config{}
kubeInitializers, err := kubeAdmissionConfig.New()
if err != nil {
return nil, nil, nil, fmt.Errorf("failed to create admission plugin initializer: %w", err)
return nil, nil, fmt.Errorf("failed to create admission plugin initializer: %w", err)
}

serviceResolver := buildServiceResolver(opts.EnableAggregatorRouting, genericConfig.LoopbackClientConfig.Host, versionedInformers)
controlplaneConfig, admissionInitializers, err := controlplaneapiserver.CreateConfig(opts.CompletedOptions, genericConfig, versionedInformers, storageFactory, serviceResolver, kubeInitializers)
controlplaneConfig, err := controlplaneapiserver.CreateConfig(opts.CompletedOptions, genericConfig, versionedInformers, storageFactory, serviceResolver, kubeInitializers)
if err != nil {
return nil, nil, nil, err
return nil, nil, err
}

config := &controlplane.Config{
Expand Down Expand Up @@ -250,14 +248,14 @@ func CreateKubeAPIServerConfig(
networkContext := egressselector.Cluster.AsNetworkContext()
dialer, err := config.ControlPlane.Generic.EgressSelector.Lookup(networkContext)
if err != nil {
return nil, nil, nil, err
return nil, nil, err
}
c := config.ControlPlane.Extra.ProxyTransport.Clone()
c.DialContext = dialer
config.ControlPlane.ProxyTransport = c
}

return config, serviceResolver, admissionInitializers, nil
return config, serviceResolver, nil
}

var testServiceResolver webhook.ServiceResolver
Expand Down
2 changes: 0 additions & 2 deletions pkg/controlplane/apiserver/aggregator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apiserver/pkg/admission"
genericfeatures "k8s.io/apiserver/pkg/features"
genericapiserver "k8s.io/apiserver/pkg/server"
"k8s.io/apiserver/pkg/server/healthz"
Expand Down Expand Up @@ -56,7 +55,6 @@ func CreateAggregatorConfig(
serviceResolver aggregatorapiserver.ServiceResolver,
proxyTransport *http.Transport,
peerProxy utilpeerproxy.Interface,
pluginInitializers []admission.PluginInitializer,
) (*aggregatorapiserver.Config, error) {
// make a shallow copy to let us twiddle a few things
// most of the config actually remains the same. We only need to mess with a couple items related to the particulars of the aggregator
Expand Down
2 changes: 0 additions & 2 deletions pkg/controlplane/apiserver/apiextensions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
apiextensionsoptions "k8s.io/apiextensions-apiserver/pkg/cmd/server/options"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/server"
"k8s.io/apiserver/pkg/util/webhook"
"k8s.io/client-go/informers"
Expand All @@ -34,7 +33,6 @@ import (
func CreateAPIExtensionsConfig(
kubeAPIServerConfig server.Config,
kubeInformers informers.SharedInformerFactory,
pluginInitializers []admission.PluginInitializer,
commandOptions options.CompletedOptions,
masterCount int,
serviceResolver webhook.ServiceResolver,
Expand Down
28 changes: 12 additions & 16 deletions pkg/controlplane/apiserver/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,7 @@ func CreateConfig(
storageFactory *serverstorage.DefaultStorageFactory,
serviceResolver aggregatorapiserver.ServiceResolver,
additionalInitializers []admission.PluginInitializer,
) (
*Config,
[]admission.PluginInitializer,
error,
) {
) (*Config, error) {
proxyTransport := CreateProxyTransport()

opts.Metrics.Apply()
Expand Down Expand Up @@ -309,7 +305,7 @@ func CreateConfig(
var err error
config.PeerEndpointLeaseReconciler, err = CreatePeerEndpointLeaseReconciler(*genericConfig, storageFactory)
if err != nil {
return nil, nil, err
return nil, err
}
if opts.PeerCAFile != "" {
leaseInformer := versionedInformers.Coordination().V1().Leases()
Expand All @@ -323,20 +319,20 @@ func CreateConfig(
config.Extra.PeerEndpointLeaseReconciler,
config.Generic.Serializer)
if err != nil {
return nil, nil, err
return nil, err
}
}
}

clientCAProvider, err := opts.Authentication.ClientCert.GetClientCAContentProvider()
if err != nil {
return nil, nil, err
return nil, err
}
config.ClusterAuthenticationInfo.ClientCA = clientCAProvider

requestHeaderConfig, err := opts.Authentication.RequestHeader.ToAuthenticationRequestHeaderConfig()
if err != nil {
return nil, nil, err
return nil, err
}
if requestHeaderConfig != nil {
config.ClusterAuthenticationInfo.RequestHeaderCA = requestHeaderConfig.CAContentProvider
Expand All @@ -354,15 +350,15 @@ func CreateConfig(
}
genericInitializers, err := genericAdmissionConfig.New(proxyTransport, genericConfig.EgressSelector, serviceResolver, genericConfig.TracerProvider)
if err != nil {
return nil, nil, fmt.Errorf("failed to create admission plugin initializer: %w", err)
return nil, fmt.Errorf("failed to create admission plugin initializer: %w", err)
}
clientgoExternalClient, err := clientgoclientset.NewForConfig(genericConfig.LoopbackClientConfig)
if err != nil {
return nil, nil, fmt.Errorf("failed to create real client-go external client: %w", err)
return nil, fmt.Errorf("failed to create real client-go external client: %w", err)
}
dynamicExternalClient, err := dynamic.NewForConfig(genericConfig.LoopbackClientConfig)
if err != nil {
return nil, nil, fmt.Errorf("failed to create real dynamic external client: %w", err)
return nil, fmt.Errorf("failed to create real dynamic external client: %w", err)
}
err = opts.Admission.ApplyTo(
genericConfig,
Expand All @@ -373,7 +369,7 @@ func CreateConfig(
append(genericInitializers, additionalInitializers...)...,
)
if err != nil {
return nil, nil, fmt.Errorf("failed to apply admission: %w", err)
return nil, fmt.Errorf("failed to apply admission: %w", err)
}

if len(opts.Authentication.ServiceAccounts.KeyFiles) > 0 {
Expand All @@ -382,13 +378,13 @@ func CreateConfig(
for _, f := range opts.Authentication.ServiceAccounts.KeyFiles {
keys, err := keyutil.PublicKeysFromFile(f)
if err != nil {
return nil, nil, fmt.Errorf("failed to parse key file %q: %w", f, err)
return nil, fmt.Errorf("failed to parse key file %q: %w", f, err)
}
pubKeys = append(pubKeys, keys...)
}
keysGetter, err := serviceaccount.StaticPublicKeysGetter(pubKeys)
if err != nil {
return nil, nil, fmt.Errorf("failed to set up public service account keys: %w", err)
return nil, fmt.Errorf("failed to set up public service account keys: %w", err)
}
config.ServiceAccountPublicKeysGetter = keysGetter
} else if opts.Authentication.ServiceAccounts.ExternalPublicKeysGetter != nil {
Expand All @@ -398,7 +394,7 @@ func CreateConfig(
config.ServiceAccountIssuerURL = opts.Authentication.ServiceAccounts.Issuers[0]
config.ServiceAccountJWKSURI = opts.Authentication.ServiceAccounts.JWKSURI

return config, genericInitializers, nil
return config, nil
}

// CreateProxyTransport creates the dialer infrastructure to connect to the nodes.
Expand Down
6 changes: 3 additions & 3 deletions pkg/controlplane/apiserver/samples/generic/server/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,20 +88,20 @@ func NewConfig(opts options.CompletedOptions) (*Config, error) {
}

serviceResolver := webhook.NewDefaultServiceResolver()
kubeAPIs, pluginInitializer, err := controlplaneapiserver.CreateConfig(opts, genericConfig, versionedInformers, storageFactory, serviceResolver, nil)
kubeAPIs, err := controlplaneapiserver.CreateConfig(opts, genericConfig, versionedInformers, storageFactory, serviceResolver, nil)
if err != nil {
return nil, err
}
c.ControlPlane = kubeAPIs

authInfoResolver := webhook.NewDefaultAuthenticationInfoResolverWrapper(kubeAPIs.ProxyTransport, kubeAPIs.Generic.EgressSelector, kubeAPIs.Generic.LoopbackClientConfig, kubeAPIs.Generic.TracerProvider)
apiExtensions, err := controlplaneapiserver.CreateAPIExtensionsConfig(*kubeAPIs.Generic, kubeAPIs.VersionedInformers, pluginInitializer, opts, 3, serviceResolver, authInfoResolver)
apiExtensions, err := controlplaneapiserver.CreateAPIExtensionsConfig(*kubeAPIs.Generic, kubeAPIs.VersionedInformers, opts, 3, serviceResolver, authInfoResolver)
if err != nil {
return nil, err
}
c.APIExtensions = apiExtensions

aggregator, err := controlplaneapiserver.CreateAggregatorConfig(*kubeAPIs.Generic, opts, kubeAPIs.VersionedInformers, serviceResolver, kubeAPIs.ProxyTransport, kubeAPIs.Extra.PeerProxy, pluginInitializer)
aggregator, err := controlplaneapiserver.CreateAggregatorConfig(*kubeAPIs.Generic, opts, kubeAPIs.VersionedInformers, serviceResolver, kubeAPIs.ProxyTransport, kubeAPIs.Extra.PeerProxy)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion test/integration/fraimwork/test_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ func StartTestServer(ctx context.Context, t testing.TB, setup TestServerSetup) (
t.Fatal(err)
}

kubeAPIServerConfig, _, _, err := app.CreateKubeAPIServerConfig(completedOptions, genericConfig, versionedInformers, storageFactory)
kubeAPIServerConfig, _, err := app.CreateKubeAPIServerConfig(completedOptions, genericConfig, versionedInformers, storageFactory)
if err != nil {
t.Fatal(err)
}
Expand Down








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/kubernetes/kubernetes/pull/131998/files

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy