Merge pull request #94 from OrangeBao/main

fix: init event recorder
kosmos-io · Oct 9, 2023 · 0d01540 · 0d01540
2 parents 9ae373b + 7f96cb8
commit 0d01540
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/pkg/clustertree/knode-manager/controllers/pod.go b/pkg/clustertree/knode-manager/controllers/pod.go
@@ -20,6 +20,7 @@ import (
 	"k8s.io/klog/v2"
 
 	"github.com/kosmos.io/kosmos/pkg/clustertree/knode-manager/adapters"
+	k8sadapter "github.com/kosmos.io/kosmos/pkg/clustertree/knode-manager/adapters/k8s"
 	"github.com/kosmos.io/kosmos/pkg/clustertree/knode-manager/utils/manager"
 	"github.com/kosmos.io/kosmos/pkg/clustertree/knode-manager/utils/podutils"
 	"github.com/kosmos.io/kosmos/pkg/utils"
@@ -117,6 +118,7 @@ func NewPodController(cfg PodConfig) (*PodController, error) {
 		podsLister:      cfg.PodInformer.Lister(),
 		podHandler:      cfg.PodHandler,
 		resourceManager: rm,
+		recorder:        cfg.EventRecorder,
 	}
 
 	keyFunc := func(obj interface{}) (utils.QueueKey, error) {
@@ -158,6 +160,11 @@ func (pc *PodController) Run(ctx context.Context, podSyncWorkers int) (retErr er
 
 	var eventHandler cache.ResourceEventHandler = cache.ResourceEventHandlerFuncs{
 		AddFunc: func(pod interface{}) {
+			podInstance := pod.(*corev1.Pod)
+			if podInstance.Namespace == k8sadapter.ReservedNS {
+				return
+			}
+
 			if key, err := cache.MetaNamespaceKeyFunc(pod); err != nil {
 				klog.Error(err)
 			} else {
@@ -169,6 +176,10 @@ func (pc *PodController) Run(ctx context.Context, podSyncWorkers int) (retErr er
 			oldPod := oldObj.(*corev1.Pod)
 			newPod := newObj.(*corev1.Pod)
 
+			if newPod.Namespace == k8sadapter.ReservedNS {
+				return
+			}
+
 			if key, err := cache.MetaNamespaceKeyFunc(newPod); err != nil {
 				klog.Error(err)
 			} else {
@@ -202,6 +213,11 @@ func (pc *PodController) Run(ctx context.Context, podSyncWorkers int) (retErr er
 			}
 		},
 		DeleteFunc: func(pod interface{}) {
+			podInstance := pod.(*corev1.Pod)
+
+			if podInstance.Namespace == k8sadapter.ReservedNS {
+				return
+			}
 			if key, err := cache.MetaNamespaceKeyFunc(pod); err != nil {
 				klog.Error(err)
 			} else {
@@ -299,21 +315,21 @@ func (pc *PodController) createOrUpdatePod(ctx context.Context, pod *corev1.Pod)
 			klog.Infof("Pod %s exists, updating pod in adapter", podFromAdapter.Name)
 			if origErr := pc.podHandler.Update(ctx, podForAdapter); origErr != nil {
 				pc.handleAdapterError(ctx, origErr, pod)
-				//pc.recorder.Event(pod, corev1.EventTypeWarning, podEventUpdateFailed, origErr.Error())
+				pc.recorder.Event(pod, corev1.EventTypeWarning, podEventUpdateFailed, origErr.Error())
 
 				return origErr
 			}
 			klog.Info("Updated pod in adapter")
-			//pc.recorder.Event(pod, corev1.EventTypeNormal, podEventUpdateSuccess, "Update pod in adapter successfully")
+			pc.recorder.Event(pod, corev1.EventTypeNormal, podEventUpdateSuccess, "Update pod in adapter successfully")
 		}
 	} else {
 		if origErr := pc.podHandler.Create(ctx, podForAdapter); origErr != nil {
 			pc.handleAdapterError(ctx, origErr, pod)
-			//pc.recorder.Event(pod, corev1.EventTypeWarning, podEventCreateFailed, origErr.Error())
+			pc.recorder.Event(pod, corev1.EventTypeWarning, podEventCreateFailed, origErr.Error())
 			return origErr
 		}
 		klog.Info("Created pod in adapter")
-		//pc.recorder.Event(pod, corev1.EventTypeNormal, podEventCreateSuccess, "Create pod in adapter successfully")
+		pc.recorder.Event(pod, corev1.EventTypeNormal, podEventCreateSuccess, "Create pod in adapter successfully")
 	}
 	return nil
 }

diff --git a/pkg/clustertree/knode-manager/controllers/pvpvc.go b/pkg/clustertree/knode-manager/controllers/pvpvc.go
@@ -648,7 +648,8 @@ func (c *PVPVCController) gc(ctx context.Context) {
 		klog.Error(err)
 		return
 	}
-	for _, pvc := range pvcs {
+	for _, pvcItem := range pvcs {
+		pvc := pvcItem
 		if pvc == nil {
 			continue
 		}