-
Notifications
You must be signed in to change notification settings - Fork 38.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #124621 from sttts/sttts-controlplane-admission-in…
…itializers kube-apiserver: split admission initializers into generic and non-generic
- Loading branch information
Showing
9 changed files
with
215 additions
and
106 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
/* | ||
Copyright 2024 The Kubernetes Authors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package admission | ||
|
||
import ( | ||
"net/http" | ||
|
||
"go.opentelemetry.io/otel/trace" | ||
|
||
"k8s.io/apiserver/pkg/admission" | ||
webhookinit "k8s.io/apiserver/pkg/admission/plugin/webhook/initializer" | ||
egressselector "k8s.io/apiserver/pkg/server/egressselector" | ||
"k8s.io/apiserver/pkg/util/webhook" | ||
externalinformers "k8s.io/client-go/informers" | ||
"k8s.io/client-go/rest" | ||
"k8s.io/kubernetes/pkg/kubeapiserver/admission/exclusion" | ||
quotainstall "k8s.io/kubernetes/pkg/quota/v1/install" | ||
) | ||
|
||
// Config holds the configuration needed to for initialize the admission plugins | ||
type Config struct { | ||
LoopbackClientConfig *rest.Config | ||
ExternalInformers externalinformers.SharedInformerFactory | ||
} | ||
|
||
// New sets up the plugins and admission start hooks needed for admission | ||
func (c *Config) New(proxyTransport *http.Transport, egressSelector *egressselector.EgressSelector, serviceResolver webhook.ServiceResolver, tp trace.TracerProvider) ([]admission.PluginInitializer, error) { | ||
webhookAuthResolverWrapper := webhook.NewDefaultAuthenticationInfoResolverWrapper(proxyTransport, egressSelector, c.LoopbackClientConfig, tp) | ||
webhookPluginInitializer := webhookinit.NewPluginInitializer(webhookAuthResolverWrapper, serviceResolver) | ||
|
||
kubePluginInitializer := NewPluginInitializer( | ||
quotainstall.NewQuotaConfigurationForAdmission(), | ||
exclusion.Excluded(), | ||
) | ||
|
||
return []admission.PluginInitializer{webhookPluginInitializer, kubePluginInitializer}, nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
/* | ||
Copyright 2024 The Kubernetes Authors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package admission | ||
|
||
import ( | ||
"k8s.io/apimachinery/pkg/runtime/schema" | ||
"k8s.io/apiserver/pkg/admission" | ||
"k8s.io/apiserver/pkg/admission/initializer" | ||
quota "k8s.io/apiserver/pkg/quota/v1" | ||
) | ||
|
||
// PluginInitializer is used for initialization of the generic controlplane admission plugins. | ||
type PluginInitializer struct { | ||
quotaConfiguration quota.Configuration | ||
excludedAdmissionResources []schema.GroupResource | ||
} | ||
|
||
var _ admission.PluginInitializer = &PluginInitializer{} | ||
|
||
// NewPluginInitializer constructs new instance of PluginInitializer | ||
func NewPluginInitializer( | ||
quotaConfiguration quota.Configuration, | ||
excludedAdmissionResources []schema.GroupResource, | ||
) *PluginInitializer { | ||
return &PluginInitializer{ | ||
quotaConfiguration: quotaConfiguration, | ||
excludedAdmissionResources: excludedAdmissionResources, | ||
} | ||
} | ||
|
||
// Initialize checks the initialization interfaces implemented by each plugin | ||
// and provide the appropriate initialization data | ||
func (i *PluginInitializer) Initialize(plugin admission.Interface) { | ||
if wants, ok := plugin.(initializer.WantsQuotaConfiguration); ok { | ||
wants.SetQuotaConfiguration(i.quotaConfiguration) | ||
} | ||
|
||
if wants, ok := plugin.(initializer.WantsExcludedAdmissionResources); ok { | ||
wants.SetExcludedAdmissionResources(i.excludedAdmissionResources) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
/* | ||
Copyright 2024 The Kubernetes Authors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package admission | ||
|
||
import ( | ||
"context" | ||
"testing" | ||
|
||
"k8s.io/apimachinery/pkg/runtime/schema" | ||
"k8s.io/apiserver/pkg/admission" | ||
quota "k8s.io/apiserver/pkg/quota/v1" | ||
) | ||
|
||
type doNothingAdmission struct{} | ||
|
||
func (doNothingAdmission) Admit(ctx context.Context, a admission.Attributes, o admission.ObjectInterfaces) error { | ||
return nil | ||
} | ||
func (doNothingAdmission) Handles(o admission.Operation) bool { return false } | ||
func (doNothingAdmission) Validate() error { return nil } | ||
|
||
type doNothingPluginInitialization struct{} | ||
|
||
func (doNothingPluginInitialization) ValidateInitialization() error { return nil } | ||
|
||
type doNothingQuotaConfiguration struct{} | ||
|
||
func (doNothingQuotaConfiguration) IgnoredResources() map[schema.GroupResource]struct{} { return nil } | ||
|
||
func (doNothingQuotaConfiguration) Evaluators() []quota.Evaluator { return nil } | ||
|
||
type WantsQuotaConfigurationAdmissionPlugin struct { | ||
doNothingAdmission | ||
doNothingPluginInitialization | ||
config quota.Configuration | ||
} | ||
|
||
func (p *WantsQuotaConfigurationAdmissionPlugin) SetQuotaConfiguration(config quota.Configuration) { | ||
p.config = config | ||
} | ||
|
||
func TestQuotaConfigurationAdmissionPlugin(t *testing.T) { | ||
config := doNothingQuotaConfiguration{} | ||
initializer := NewPluginInitializer(config, nil) | ||
wantsQuotaConfigurationAdmission := &WantsQuotaConfigurationAdmissionPlugin{} | ||
initializer.Initialize(wantsQuotaConfigurationAdmission) | ||
|
||
if wantsQuotaConfigurationAdmission.config == nil { | ||
t.Errorf("Expected quota configuration to be initialized but found nil") | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.