github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

extend VAP status controller for extensions type checking.

Browse Source
This commit is contained in:
Jiahui Feng 2023-10-26 10:26:03 -07:00
parent 3f73cdcf2a
commit fd132665a8
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/kube-controller-manager/app/validatingadmissionpolicystatus.go
View File

@ -19,10 +19,11 @@ package app
import ( import (
"context" "context"
apiextensionsscheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme"
pluginvalidatingadmissionpolicy "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy" pluginvalidatingadmissionpolicy "k8s.io/apiserver/pkg/admission/plugin/validatingadmissionpolicy"
"k8s.io/apiserver/pkg/cel/openapi/resolver" "k8s.io/apiserver/pkg/cel/openapi/resolver"
genericfeatures "k8s.io/apiserver/pkg/features" genericfeatures "k8s.io/apiserver/pkg/features"
"k8s.io/client-go/kubernetes/scheme" k8sscheme "k8s.io/client-go/kubernetes/scheme"
"k8s.io/component-base/featuregate" "k8s.io/component-base/featuregate"
"k8s.io/controller-manager/controller" "k8s.io/controller-manager/controller"
"k8s.io/kubernetes/cmd/kube-controller-manager/names" "k8s.io/kubernetes/cmd/kube-controller-manager/names"
@ -42,8 +43,12 @@ func newValidatingAdmissionPolicyStatusControllerDescriptor() *ControllerDescrip
func startValidatingAdmissionPolicyStatusController(ctx context.Context, controllerContext ControllerContext, controllerName string) (controller.Interface, bool, error) { func startValidatingAdmissionPolicyStatusController(ctx context.Context, controllerContext ControllerContext, controllerName string) (controller.Interface, bool, error) {
// KCM won't start the controller without the feature gate set. // KCM won't start the controller without the feature gate set.
schemaResolver := resolver.NewDefinitionsSchemaResolver(openapi.GetOpenAPIDefinitions, k8sscheme.Scheme, apiextensionsscheme.Scheme).
Combine(&resolver.ClientDiscoveryResolver{Discovery: controllerContext.ClientBuilder.DiscoveryClientOrDie(names.ValidatingAdmissionPolicyStatusController)})
typeChecker := &pluginvalidatingadmissionpolicy.TypeChecker{ typeChecker := &pluginvalidatingadmissionpolicy.TypeChecker{
SchemaResolver: resolver.NewDefinitionsSchemaResolver(scheme.Scheme, openapi.GetOpenAPIDefinitions), SchemaResolver: schemaResolver,
RestMapper: controllerContext.RESTMapper, RestMapper: controllerContext.RESTMapper,
} }
c, err := validatingadmissionpolicystatus.NewController( c, err := validatingadmissionpolicystatus.NewController(

2
pkg/controller/validatingadmissionpolicystatus/controller_test.go
View File

@ -103,7 +103,7 @@ func TestTypeChecking(t *testing.T) {
client := fake.NewSimpleClientset(policy) client := fake.NewSimpleClientset(policy)
informerFactory := informers.NewSharedInformerFactory(client, 0) informerFactory := informers.NewSharedInformerFactory(client, 0)
typeChecker := &validatingadmissionpolicy.TypeChecker{ typeChecker := &validatingadmissionpolicy.TypeChecker{
SchemaResolver: resolver.NewDefinitionsSchemaResolver(scheme.Scheme, openapi.GetOpenAPIDefinitions), SchemaResolver: resolver.NewDefinitionsSchemaResolver(openapi.GetOpenAPIDefinitions, scheme.Scheme),
RestMapper: testrestmapper.TestOnlyStaticRESTMapper(scheme.Scheme), RestMapper: testrestmapper.TestOnlyStaticRESTMapper(scheme.Scheme),
} }
controller, err := NewController( controller, err := NewController(