weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Remove ServerOption type now that webhook initialization has moved to internal package

Browse Source 
Signed-off-by: James Munnelly <jmunnelly@apple.com>
This commit is contained in:
James Munnelly 2021-12-16 16:05:54 +00:00
parent fa61625d5f
commit bf98c92a44
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/webhook/app/testing/testwebhook.go
View File

@ -56,7 +56,7 @@ type ServerOptions struct {
CAPEM []byte CAPEM []byte
} }
func StartWebhookServer(t *testing.T, ctx context.Context, args []string, argumentsForNewServerWithOptions ...webhook.ServerOption) (ServerOptions, StopFunc) { func StartWebhookServer(t *testing.T, ctx context.Context, args []string, argumentsForNewServerWithOptions ...func(*server.Server)) (ServerOptions, StopFunc) {
log := logtesting.NewTestLogger(t) log := logtesting.NewTestLogger(t)
fs := pflag.NewFlagSet("testset", pflag.ExitOnError) fs := pflag.NewFlagSet("testset", pflag.ExitOnError)

6
internal/webhook/webhook.go
View File

@ -44,11 +44,9 @@ import (
var conversionHook handlers.ConversionHook = handlers.NewSchemeBackedConverter(logf.Log, Scheme) var conversionHook handlers.ConversionHook = handlers.NewSchemeBackedConverter(logf.Log, Scheme)
type ServerOption func(*server.Server)
// WithConversionHandler allows you to override the handler for the `/convert` // WithConversionHandler allows you to override the handler for the `/convert`
// endpoint in tests. // endpoint in tests.
func WithConversionHandler(handler handlers.ConversionHook) ServerOption { func WithConversionHandler(handler handlers.ConversionHook) func(*server.Server) {
return func(s *server.Server) { return func(s *server.Server) {
s.ConversionWebhook = handler s.ConversionWebhook = handler
} }
@ -56,7 +54,7 @@ func WithConversionHandler(handler handlers.ConversionHook) ServerOption {
// NewCertManagerWebhookServer creates a new webhook server configured with all cert-manager // NewCertManagerWebhookServer creates a new webhook server configured with all cert-manager
// resource types, validation, defaulting and conversion functions. // resource types, validation, defaulting and conversion functions.
func NewCertManagerWebhookServer(log logr.Logger, _ options.WebhookFlags, opts config.WebhookConfiguration, optionFunctions ...ServerOption) (*server.Server, error) { func NewCertManagerWebhookServer(log logr.Logger, _ options.WebhookFlags, opts config.WebhookConfiguration, optionFunctions ...func(*server.Server)) (*server.Server, error) {
restcfg, err := clientcmd.BuildConfigFromFlags(opts.APIServerHost, opts.KubeConfig) restcfg, err := clientcmd.BuildConfigFromFlags(opts.APIServerHost, opts.KubeConfig)
if err != nil { if err != nil {
return nil, err return nil, err