Add webhook singleton command

Signed-off-by: Jian Qiu <[email protected]>

Author: qiujian16

cmd/registration-operator/main.go

@@ -48,6 +48,7 @@ func newNucleusCommand() *cobra.Command {
 
 	cmd.AddCommand(hub.NewHubOperatorCmd())
 	cmd.AddCommand(hub.NewHubManagerCmd())
+	cmd.AddCommand(hub.NewWebhookCmd())
 	cmd.AddCommand(spoke.NewKlusterletOperatorCmd())
 	cmd.AddCommand(spoke.NewKlusterletAgentCmd())
 

pkg/cmd/hub/operator.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"k8s.io/utils/clock"
+	ctrl "sigs.k8s.io/controller-runtime"
 
 	commonoptions "open-cluster-management.io/ocm/pkg/common/options"
 	"open-cluster-management.io/ocm/pkg/operator/operators/clustermanager"
@@ -47,3 +48,24 @@ func NewHubManagerCmd() *cobra.Command {
 	opts.AddFlags(flags)
 	return cmd
 }
+
+func NewWebhookCmd() *cobra.Command {
+	webhookOptions := commonoptions.NewWebhookOptions()
+	opts := hub.NewWebhookOptions()
+	cmd := &cobra.Command{
+		Use:   "webhook-server",
+		Short: "Start the registration webhook server",
+		RunE: func(c *cobra.Command, args []string) error {
+			if err := opts.SetupWebhookServer(webhookOptions); err != nil {
+				return err
+			}
+			return webhookOptions.RunWebhookServer(ctrl.SetupSignalHandler())
+		},
+	}
+
+	flags := cmd.Flags()
+	opts.AddFlags(flags)
+	webhookOptions.AddFlags(flags)
+
+	return cmd
+}

pkg/singleton/hub/webhook.go

@@ -0,0 +1,36 @@
+package hub
+
+import (
+	"github.com/spf13/pflag"
+
+	commonoptions "open-cluster-management.io/ocm/pkg/common/options"
+	registrationwebhook "open-cluster-management.io/ocm/pkg/registration/webhook"
+	workwebhook "open-cluster-management.io/ocm/pkg/work/webhook"
+)
+
+// Config contains the server (the webhook) cert and key.
+type WebhookOptions struct {
+	workWebhookOptions *workwebhook.Options
+}
+
+// NewWebhookOptions constructs a new set of default options for webhook.
+func NewWebhookOptions() *WebhookOptions {
+	return &WebhookOptions{
+		workWebhookOptions: workwebhook.NewOptions(),
+	}
+}
+
+func (c *WebhookOptions) AddFlags(fs *pflag.FlagSet) {
+	c.workWebhookOptions.AddFlags(fs)
+}
+
+func (c *WebhookOptions) SetupWebhookServer(opts *commonoptions.WebhookOptions) error {
+	if err := registrationwebhook.SetupWebhookServer(opts); err != nil {
+		return err
+	}
+	if err := c.workWebhookOptions.SetupWebhookServer(opts); err != nil {
+		return err
+	}
+
+	return nil
+}

pkg/work/webhook/option.go

@@ -1,6 +1,8 @@
 package webhook
 
-import "github.com/spf13/pflag"
+import (
+	"github.com/spf13/pflag"
+)
 
 // Config contains the server (the webhook) cert and key.
 type Options struct {

pkg/work/webhook/start.go

@@ -2,7 +2,6 @@ package webhook
 
 import (
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
 	ocmfeature "open-cluster-management.io/api/feature"
 	workv1 "open-cluster-management.io/api/work/v1"