feature: Optimizing Pod SidecarSet webhook performance #1546

Signed-off-by: acejilam <[email protected]>
openkruise · Mar 28, 2024 · 983fdd8 · 983fdd8
1 parent 912de49
commit 983fdd8
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 5 deletions.
diff --git a/pkg/util/fieldindex/register.go b/pkg/util/fieldindex/register.go
@@ -20,21 +20,26 @@ import (
 	"context"
 	"sync"
 
-	"sigs.k8s.io/controller-runtime/pkg/client"
-
 	appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1"
+	"github.com/openkruise/kruise/pkg/util"
+	utilclient "github.com/openkruise/kruise/pkg/util/client"
 	utildiscovery "github.com/openkruise/kruise/pkg/util/discovery"
+
 	batchv1 "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 const (
 	IndexNameForPodNodeName = "spec.nodeName"
 	IndexNameForOwnerRefUID = "ownerRefUID"
 	IndexNameForController  = ".metadata.controller"
 	IndexNameForIsActive    = "isActive"
+	IndexNamespace          = "namespace"
 )
 
 var (
@@ -87,6 +92,12 @@ func RegisterFieldIndexes(c cache.Cache) error {
 				return
 			}
 		}
+		// sidecar spec namespaces
+		if utildiscovery.DiscoverObject(&appsv1alpha1.SidecarSet{}) {
+			if err = indexSideCatSet(c); err != nil {
+				return
+			}
+		}
 	})
 	return err
 }
@@ -152,3 +163,35 @@ func indexImagePullJobActive(c cache.Cache) error {
 		return []string{isActive}
 	})
 }
+
+func indexSideCatSet(c cache.Cache) error {
+	return c.IndexField(context.TODO(), &appsv1alpha1.SidecarSet{}, IndexNamespace, func(rawObj client.Object) []string {
+		obj := rawObj.(*appsv1alpha1.SidecarSet)
+		if obj == nil {
+			return nil
+		}
+
+		ns := sets.NewString()
+		//If Namespace is not empty, sidecarSet will only match the pods in the namespaces
+		if obj.Spec.Namespace != "" {
+			ns.Insert(obj.Spec.Namespace)
+		}
+
+		if obj.Spec.NamespaceSelector != nil {
+
+			selector, err := util.ValidatedLabelSelectorAsSelector(obj.Spec.NamespaceSelector)
+			if err != nil {
+				klog.Errorf("Error converting SidecarSet %s:%s NamespaceSelector: %v", obj.Namespace, obj.Name, err)
+			}
+			nameSpaceList := v1.NamespaceList{}
+			if err := c.List(context.TODO(), &nameSpaceList, client.MatchingLabelsSelector{Selector: selector}, utilclient.DisableDeepCopy); err != nil {
+				klog.Errorf("Error query SidecarSet %s:%s NamespaceSelector: %v", obj.Namespace, obj.Name, err)
+			}
+			for _, namespace := range nameSpaceList.Items {
+				ns.Insert(namespace.Namespace)
+			}
+		}
+
+		return ns.List()
+	})
+}
diff --git a/pkg/webhook/sidecarset/validating/sidecarset_create_update_handler.go b/pkg/webhook/sidecarset/validating/sidecarset_create_update_handler.go
@@ -19,6 +19,9 @@ package validating
 import (
 	"context"
 	"fmt"
+	utilclient "github.com/openkruise/kruise/pkg/util/client"
+	"github.com/openkruise/kruise/pkg/util/fieldindex"
+	"k8s.io/klog/v2"
 	"net/http"
 	"reflect"
 	"regexp"
@@ -93,10 +96,32 @@ func (h *SidecarSetCreateUpdateHandler) validateSidecarSet(obj *appsv1alpha1.Sid
 	}
 	// iterate across all containers in other sidecarsets to avoid duplication of name
 	sidecarSets := &appsv1alpha1.SidecarSetList{}
-	if err := h.Client.List(context.TODO(), sidecarSets, &client.ListOptions{}); err != nil {
-		allErrs = append(allErrs, field.InternalError(field.NewPath(""), fmt.Errorf("query other sidecarsets failed, err: %v", err)))
+	ns := sets.NewString()
+	//If Namespace is not empty, sidecarSet will only match the pods in the namespaces
+	if obj.Spec.Namespace != "" {
+		ns.Insert(obj.Spec.Namespace)
+	}
+	if obj.Spec.NamespaceSelector != nil {
+		selector, err := util.ValidatedLabelSelectorAsSelector(obj.Spec.NamespaceSelector)
+		if err != nil {
+			allErrs = append(allErrs, field.Invalid(field.NewPath("spec").Child("namespaceSelector"), obj.Spec.NamespaceSelector, err.Error()))
+		}
+		nameSpaceList := v1.NamespaceList{}
+		if err := h.Client.List(context.TODO(), &nameSpaceList, client.MatchingLabelsSelector{Selector: selector}, utilclient.DisableDeepCopy); err != nil {
+			klog.Errorf("Error query SidecarSet %s:%s namespaceSelector: %v", obj.Namespace, obj.Name, err)
+		}
+		for _, namespace := range nameSpaceList.Items {
+			ns.Insert(namespace.Namespace)
+		}
 	}
-	allErrs = append(allErrs, validateSidecarConflict(h.Client, sidecarSets, obj, field.NewPath("spec"))...)
+
+	for _, namespace := range ns.List() {
+		if err := h.Client.List(context.TODO(), sidecarSets, client.MatchingFields{fieldindex.IndexNamespace: namespace}, utilclient.DisableDeepCopy); err != nil {
+			allErrs = append(allErrs, field.InternalError(field.NewPath("spec"), fmt.Errorf("query other namespaces failed, err: %v", err)))
+		}
+		allErrs = append(allErrs, validateSidecarConflict(h.Client, sidecarSets, obj, field.NewPath("spec"))...)
+	}
+
 	return allErrs
 }