From 0dfbc85cd9f7c0578ed385928e6990a496112e6c Mon Sep 17 00:00:00 2001 From: Joe Betz Date: Fri, 25 Oct 2024 18:44:10 -0400 Subject: [PATCH] Rename dispatcher Run to Start to match naming conventions --- .../pkg/admission/plugin/policy/generic/interfaces.go | 4 ++-- .../apiserver/pkg/admission/plugin/policy/generic/plugin.go | 2 +- .../pkg/admission/plugin/policy/generic/policy_dispatcher.go | 4 ++-- .../pkg/admission/plugin/policy/generic/policy_source_test.go | 3 ++- .../pkg/admission/plugin/policy/mutating/dispatcher.go | 4 ++-- .../pkg/admission/plugin/policy/validating/dispatcher.go | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/generic/interfaces.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/generic/interfaces.go index 58f4a374dca..29e6eee6731 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/generic/interfaces.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/generic/interfaces.go @@ -49,8 +49,8 @@ type Source[H Hook] interface { // Dispatcher dispatches evaluates an admission request against the currently // active hooks returned by the source. type Dispatcher[H Hook] interface { - // Run the dispatcher. This method should be called only once at startup. - Run(ctx context.Context) error + // Start the dispatcher. This method should be called only once at startup. + Start(ctx context.Context) error // Dispatch a request to the policies. Dispatcher may choose not to // call a hook, either because the rules of the hook does not match, or diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/generic/plugin.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/generic/plugin.go index fa1f851892b..03aebdd58ac 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/generic/plugin.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/generic/plugin.go @@ -186,7 +186,7 @@ func (c *Plugin[H]) ValidateInitialization() error { } }() - err := c.dispatcher.Run(pluginContext) + err := c.dispatcher.Start(pluginContext) if err != nil && !errors.Is(err, context.Canceled) { utilruntime.HandleError(fmt.Errorf("policy dispatcher context unexpectedly closed: %w", err)) } diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/generic/policy_dispatcher.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/generic/policy_dispatcher.go index 6586f486b94..c520d38203c 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/generic/policy_dispatcher.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/generic/policy_dispatcher.go @@ -95,12 +95,12 @@ func NewPolicyDispatcher[P runtime.Object, B runtime.Object, E Evaluator]( } } -// Dispatch implements generic.Dispatcher. It loops through all active hooks +// Start implements generic.Dispatcher Start. It loops through all active hooks // (policy x binding pairs) and selects those which are active for the current // request. It then resolves all params and creates an Invocation for each // matching policy-binding-param tuple. The delegate is then called with the // list of tuples. -func (d *policyDispatcher[P, B, E]) Run(ctx context.Context) error { +func (d *policyDispatcher[P, B, E]) Start(ctx context.Context) error { return nil } diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/generic/policy_source_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/generic/policy_source_test.go index 6f95ae25715..d67d5402fc9 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/generic/policy_source_test.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/generic/policy_source_test.go @@ -21,6 +21,7 @@ import ( "testing" "github.com/stretchr/testify/require" + "k8s.io/api/admissionregistration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -38,7 +39,7 @@ type fakeDispatcher struct{} func (fd *fakeDispatcher) Dispatch(context.Context, admission.Attributes, admission.ObjectInterfaces, []generic.PolicyHook[*FakePolicy, *FakeBinding, generic.Evaluator]) error { return nil } -func (fd *fakeDispatcher) Run(context.Context) error { +func (fd *fakeDispatcher) Start(context.Context) error { return nil } diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/mutating/dispatcher.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/mutating/dispatcher.go index 0d93661c863..d8d0953c22e 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/mutating/dispatcher.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/mutating/dispatcher.go @@ -63,9 +63,9 @@ type dispatcher struct { generic.Dispatcher[PolicyHook] } -func (d *dispatcher) Run(ctx context.Context) error { +func (d *dispatcher) Start(ctx context.Context) error { go d.typeConverterManager.Run(ctx) - return d.Dispatcher.Run(ctx) + return d.Dispatcher.Start(ctx) } func (d *dispatcher) dispatchInvocations( diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/dispatcher.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/dispatcher.go index 5d47c94a25d..8f3e22f64dc 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/dispatcher.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/policy/validating/dispatcher.go @@ -64,7 +64,7 @@ type policyDecisionWithMetadata struct { Binding *admissionregistrationv1.ValidatingAdmissionPolicyBinding } -func (c *dispatcher) Run(ctx context.Context) error { +func (c *dispatcher) Start(ctx context.Context) error { return nil }