add disable-independent-webhooks parameter for yurt-manager

Signed-off-by: hxcGit <houxc_mail@163.com>

charts/openyurt/templates/yurt-manager.yaml

@@ -61,8 +61,8 @@ spec:
             {{- if .Values.yurtManager.controllers }}
             - --controllers={{ .Values.yurtManager.controllers }}
             {{- end }}
-            - {{- if .Values.yurtManager.webhooks }}
-            - --controllers={{ .Values.yurtManager.webhooks }}
+            - {{- if .Values.yurtManager.disableIndependentWebhooks }}
+            - --disable-independent-webhooks={{ .Values.yurtManager.disableIndependentWebhooks }}
             {{- end }}
           command:
             - /usr/local/bin/yurt-manager

charts/openyurt/values.yaml

@@ -58,7 +58,8 @@ yurtManager:
     port: 10271
   # format should be "foo,-bar,*"
   controllers: ""
-  webhooks: ""
+  # format should be "foo,*"
+  disableIndependentWebhooks: ""
   healthProbe:
     port: 10272
   # resources of yurt-manager container

cmd/yurt-manager/app/options/generic.go

@@ -41,7 +41,7 @@ func NewGenericOptions() *GenericOptions {
 			RestConfigBurst:         50,
 			WorkingNamespace:        "kube-system",
 			Controllers:             []string{enableAll},
-			Webhooks:                []string{enableAll},
+			DisabledWebhooks:        []string{},
 		},
 	}
 }
@@ -72,7 +72,7 @@ func (o *GenericOptions) ApplyTo(cfg *config.GenericConfiguration) error {
 	cfg.RestConfigBurst = o.RestConfigBurst
 	cfg.WorkingNamespace = o.WorkingNamespace
 	cfg.Controllers = o.Controllers
-	cfg.Webhooks = o.Webhooks
+	cfg.DisabledWebhooks = o.DisabledWebhooks
 
 	return nil
 }
@@ -93,8 +93,8 @@ func (o *GenericOptions) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&o.WorkingNamespace, "working-namespace", o.WorkingNamespace, "The namespace where the yurt-manager is working.")
 	fs.StringSliceVar(&o.Controllers, "controllers", o.Controllers, "A list of controllers to enable. "+
 		"'*' enables all on-by-default controllers, 'foo' enables the controller named 'foo', '-foo' disables the controller named 'foo'.")
-	fs.StringSliceVar(&o.Webhooks, "webhooks", o.Webhooks, "A list of webhooks to enable. "+
-		"'*' enables all on-by-default webhooks, 'foo' enables the webhook named 'foo', '-foo' disables the webhook named 'foo'.")
+	fs.StringSliceVar(&o.DisabledWebhooks, "disable-independent-webhooks", o.DisabledWebhooks, "A list of webhooks to disable. "+
+		"'*' disables all webhooks, 'foo' disables the webhook named 'foo'.")
 
 	features.DefaultMutableFeatureGate.AddFlag(fs)
 }

pkg/controller/apis/config/types.go

@@ -75,6 +75,7 @@ type GenericConfiguration struct {
 	// '-foo' means "disable 'foo'"
 	// first item for a particular name wins
 	Controllers []string
-	// Same as Controllers
-	Webhooks []string
+	// DisabledWebhooks is used to specify the disabled webhooks
+	// Only care about controller-independent webhooks
+	DisabledWebhooks []string
 }

pkg/webhook/server.go

@@ -100,21 +100,26 @@ func SetupWithManager(c *config.CompletedConfig, mgr manager.Manager) error {
 
 	// set up independent webhooks
 	for name, s := range webhooks {
-		if !util.IsWebhookEnabled(name, c.ComponentConfig.Generic.Webhooks) {
+		if util.IsWebhookDisabled(name, c.ComponentConfig.Generic.DisabledWebhooks) {
 			klog.Warningf("Webhook %v is disabled", name)
 			continue
 		}
-		return setup(s)
+		if err := setup(s); err != nil {
+			return err
+		}
 	}
 
 	// set up controller webhooks
 	for controllerName, list := range controllerWebhooks {
-		if !ctrlutil.IsControllerEnabled(controllerName, c.ComponentConfig.Generic.Controllers) {
+		if !ctrlutil.IsControllerEnabled(controllerName, c.ComponentConfig.Generic.Controllers) ||
+			util.IsWebhookDisabled(controllerName, c.ComponentConfig.Generic.DisabledWebhooks) {
 			klog.Warningf("Webhook for %v is disabled", controllerName)
 			continue
 		}
 		for _, s := range list {
-			return setup(s)
+			if err := setup(s); err != nil {
+				return err
+			}
 		}
 	}
 	return nil

pkg/webhook/util/util.go

@@ -91,19 +91,16 @@ func GenerateValidatePath(gvk schema.GroupVersionKind) string {
 		gvk.Version + "-" + strings.ToLower(gvk.Kind)
 }
 
-// IsWebhookEnabled check if a specified webhook enabled or not.
-func IsWebhookEnabled(name string, webhooks []string) bool {
+// IsWebhookDisabled check if a specified webhook disabled or not.
+func IsWebhookDisabled(name string, webhooks []string) bool {
+	hasStar := false
 	for _, ctrl := range webhooks {
 		if ctrl == name {
 			return true
 		}
-		if ctrl == "-"+name {
-			return false
-		}
 		if ctrl == "*" {
-			return true
+			hasStar = true
 		}
 	}
-
-	return false
+	return hasStar
 }