🐛 Add dependency

Signed-off-by: 刘硕 <[email protected]>
openkruise · Oct 9, 2023 · 70b8a6f · 70b8a6f
1 parent 81b5d52
commit 70b8a6f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/pkg/controller/nodepodprobe/node_pod_probe_controller.go b/pkg/controller/nodepodprobe/node_pod_probe_controller.go
@@ -63,7 +63,9 @@ var (
 // Add creates a new NodePodProbe Controller and adds it to the Manager with default RBAC. The Manager will set fields on the Controller
 // and Start it when the Manager is Started.
 func Add(mgr manager.Manager) error {
-	if !utildiscovery.DiscoverGVK(controllerKind) || !utilfeature.DefaultFeatureGate.Enabled(features.PodProbeMarkerGate) {
+	if !utildiscovery.DiscoverGVK(controllerKind) ||
+		!utilfeature.DefaultFeatureGate.Enabled(features.PodProbeMarkerGate) ||
+		!utilfeature.DefaultFeatureGate.Enabled(features.KruiseDaemon) {
 		return nil
 	}
 	return add(mgr, newReconciler(mgr))

diff --git a/pkg/webhook/podprobemarker/validating/probe_create_update_handler.go b/pkg/webhook/podprobemarker/validating/probe_create_update_handler.go
@@ -19,6 +19,8 @@ package validating
 import (
 	"context"
 	"fmt"
+	"github.com/openkruise/kruise/pkg/features"
+	utilfeature "github.com/openkruise/kruise/pkg/util/feature"
 	"net/http"
 	"reflect"
 	"regexp"
@@ -67,6 +69,12 @@ func (h *PodProbeMarkerCreateUpdateHandler) Handle(ctx context.Context, req admi
 	if err != nil {
 		return admission.Errored(http.StatusBadRequest, err)
 	}
+	if !utilfeature.DefaultFeatureGate.Enabled(features.PodProbeMarkerGate) {
+		return admission.Errored(http.StatusForbidden, fmt.Errorf("feature-gate %s is not enabled", features.PodProbeMarkerGate))
+	}
+	if !utilfeature.DefaultFeatureGate.Enabled(features.KruiseDaemon) {
+		return admission.Errored(http.StatusForbidden, fmt.Errorf("feature-gate %s is not enabled", features.KruiseDaemon))
+	}
 	var old *appsv1alpha1.PodProbeMarker
 	//when Operation is update, decode older object
 	if req.AdmissionRequest.Operation == admissionv1.Update {