Skip to content
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

Jump to bottom

apiserver: remove admission middleware #674

Merged
merged 1 commit into from
Jun 14, 2024
Merged

apiserver: remove admission middleware #674

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
14 changes: 0 additions & 14 deletions cmd/apiserver/app/options/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ import (
"strings"

utilerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle"
openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
genericrequest "k8s.io/apiserver/pkg/endpoints/request"
genericapiserver "k8s.io/apiserver/pkg/server"
genericoptions "k8s.io/apiserver/pkg/server/options"
"k8s.io/apiserver/pkg/util/feature"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/kubernetes"
cliflag "k8s.io/component-base/cli/flag"
"k8s.io/component-base/featuregate"
Expand All @@ -38,7 +36,6 @@ type ClusterPediaServerOptions struct {
Features *genericoptions.FeatureOptions
CoreAPI *genericoptions.CoreAPIOptions
FeatureGate featuregate.FeatureGate
Admission *genericoptions.AdmissionOptions
Traces *genericoptions.TracingOptions

Storage *storageoptions.StorageOptions
Expand Down Expand Up @@ -68,7 +65,6 @@ func NewServerOptions() *ClusterPediaServerOptions {
Features: featureOptions,
CoreAPI: genericoptions.NewCoreAPIOptions(),
FeatureGate: feature.DefaultFeatureGate,
Admission: genericoptions.NewAdmissionOptions(),
Traces: genericoptions.NewTracingOptions(),

Storage: storageoptions.NewStorageOptions(),
Expand Down Expand Up @@ -97,10 +93,6 @@ func (o *ClusterPediaServerOptions) Config() (*apiserver.Config, error) {
return nil, fmt.Errorf("error create self-signed certificates: %v", err)
}

// remove NamespaceLifecycle admission plugin explicitly
// current admission plugins: mutatingwebhook, validatingwebhook
o.Admission.DisablePlugins = append(o.Admission.DisablePlugins, lifecycle.PluginName)

genericConfig := genericapiserver.NewRecommendedConfig(apiserver.Codecs)

genericConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(generatedopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(apiserver.Scheme))
Expand Down Expand Up @@ -154,10 +146,6 @@ func (o *ClusterPediaServerOptions) genericOptionsApplyTo(config *genericapiserv
if err := o.Features.ApplyTo(&config.Config, client, config.SharedInformerFactory); err != nil {
return err
}
dynamicClient := dynamic.NewForConfigOrDie(config.ClientConfig)
if err := o.Admission.ApplyTo(&config.Config, config.SharedInformerFactory, client, dynamicClient, o.FeatureGate); err != nil {
return err
}
if err := o.Traces.ApplyTo(nil, &config.Config); err != nil {
return err
}
Expand All @@ -181,8 +169,6 @@ func (o *ClusterPediaServerOptions) Flags() cliflag.NamedFlagSets {
o.Audit.AddFlags(fss.FlagSet("auditing"))
o.Features.AddFlags(fss.FlagSet("features"))
logsapi.AddFlags(o.Logs, fss.FlagSet("logs"))

// o.Admission.AddFlags(fss.FlagSet("admission"))
o.Traces.AddFlags(fss.FlagSet("traces"))

o.Storage.AddFlags(fss.FlagSet("storage"))
Expand Down
Loading