feat: update event recorder names and controller names for terway control plane components

Signed-off-by: l1b0k <[email protected]>

Author: l1b0k

pkg/controller/eni/eni.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/AliyunContainerService/terway/pkg/utils"
 	"github.com/go-logr/logr"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
@@ -45,14 +46,14 @@ type ReconcileNetworkInterface struct {
 	resourceBackoff *BackoffManager
 }
 
-const controllerName = "eni"
+const ControllerName = "eni"
 
 func init() {
-	register.Add(controllerName, func(mgr manager.Manager, ctrlCtx *register.ControllerCtx) error {
+	register.Add(ControllerName, func(mgr manager.Manager, ctrlCtx *register.ControllerCtx) error {
 		ctrlCtx.RegisterResource = append(ctrlCtx.RegisterResource, &v1beta1.NetworkInterface{})
 
 		err := builder.ControllerManagedBy(mgr).
-			Named(controllerName).
+			Named(ControllerName).
 			WithOptions(controller.Options{
 				MaxConcurrentReconciles: controlplane.GetConfig().ENIMaxConcurrent,
 				LogConstructor: func(request *reconcile.Request) logr.Logger {
@@ -69,7 +70,7 @@ func init() {
 				client:          mgr.GetClient(),
 				scheme:          mgr.GetScheme(),
 				aliyun:          ctrlCtx.AliyunClient, // use direct client
-				record:          mgr.GetEventRecorderFor("TerwayENetworkInterfaceontroller"),
+				record:          mgr.GetEventRecorderFor(utils.EventName(ControllerName)),
 				resourceBackoff: NewBackoffManager(),
 			})
 

pkg/controller/multi-ip/node/pool.go

@@ -142,7 +142,7 @@ func init() {
 			Reconciler: &ReconcileNode{
 				client:             mgr.GetClient(),
 				scheme:             mgr.GetScheme(),
-				record:             mgr.GetEventRecorderFor(ControllerName),
+				record:             mgr.GetEventRecorderFor(utils.EventName(ControllerName)),
 				aliyun:             ctrlCtx.AliyunClient,
 				vswpool:            ctrlCtx.VSwitchPool,
 				fullSyncNodePeriod: fullSyncPeriod,

pkg/controller/multi-ip/pod/pod.go

@@ -3,6 +3,7 @@ package pod
 import (
 	"context"
 
+	"github.com/AliyunContainerService/terway/pkg/utils"
 	corev1 "k8s.io/api/core/v1"
 	k8sErr "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -32,7 +33,7 @@ func init() {
 			Complete(&ReconcilePod{
 				client: mgr.GetClient(),
 				scheme: mgr.GetScheme(),
-				record: mgr.GetEventRecorderFor(ControllerName),
+				record: mgr.GetEventRecorderFor(utils.EventName(ControllerName)),
 			})
 	}, false)
 }

pkg/controller/node/node.go

@@ -77,7 +77,7 @@ func init() {
 			Complete(&ReconcileNode{
 				client:          mgr.GetClient(),
 				scheme:          mgr.GetScheme(),
-				record:          mgr.GetEventRecorderFor(ControllerName),
+				record:          mgr.GetEventRecorderFor(utils.EventName(ControllerName)),
 				aliyun:          ctrlCtx.AliyunClient,
 				supportEFLO:     utilfeature.DefaultMutableFeatureGate.Enabled(feature.EFLO),
 				nodePredicate:   nodePredicate,

pkg/controller/pod-eni/eni_controller.go

@@ -62,25 +62,25 @@ import (
 	"github.com/AliyunContainerService/terway/types/controlplane"
 )
 
-var ctrlLog = ctrl.Log.WithName(controllerName)
+var ctrlLog = ctrl.Log.WithName(ControllerName)
 
-const controllerName = "pod-eni"
+const ControllerName = "pod-eni"
 const layout = "2006-01-02T15:04:05Z"
 
 func init() {
-	register.Add(controllerName, func(mgr manager.Manager, ctrlCtx *register.ControllerCtx) error {
+	register.Add(ControllerName, func(mgr manager.Manager, ctrlCtx *register.ControllerCtx) error {
 		ctrlCtx.RegisterResource = append(ctrlCtx.RegisterResource, &v1beta1.PodENI{})
 
 		r := &ReconcilePodENI{
 			client:          mgr.GetClient(),
 			scheme:          mgr.GetScheme(),
-			record:          mgr.GetEventRecorderFor("TerwayPodENIController"),
+			record:          mgr.GetEventRecorderFor(utils.EventName(ControllerName)),
 			aliyun:          ctrlCtx.AliyunClient,
 			trunkMode:       *ctrlCtx.Config.EnableTrunk,
 			crdMode:         ctrlCtx.Config.IPAMType == types.IPAMTypeCRD,
 			nodeStatusCache: ctrlCtx.NodeStatusCache,
 		}
-		c, err := controller.NewUnmanaged(controllerName, controller.Options{
+		c, err := controller.NewUnmanaged(ControllerName, controller.Options{
 			Reconciler:              r,
 			MaxConcurrentReconciles: ctrlCtx.Config.PodENIMaxConcurrent,
 		})

pkg/controller/pod-eni/eni_controller_test.go

@@ -115,7 +115,7 @@ var _ = Describe("ENI Controller Tests", func() {
 
 	Context("Test init", func() {
 		It("register should succeed", func() {
-			v, ok := register.Controllers[controllerName]
+			v, ok := register.Controllers[ControllerName]
 			Expect(ok).To(BeTrue())
 
 			mgr, ctx := testutil.NewManager(cfg, openAPI, k8sClient)

pkg/controller/pod-networking/networking.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"time"
 
+	"github.com/AliyunContainerService/terway/pkg/utils"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 
 	aliyunClient "github.com/AliyunContainerService/terway/pkg/aliyun/client"
@@ -41,14 +42,14 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
-const controllerName = "pod-networking"
+const ControllerName = "pod-networking"
 
 func init() {
-	register.Add(controllerName, func(mgr manager.Manager, ctrlCtx *register.ControllerCtx) error {
+	register.Add(ControllerName, func(mgr manager.Manager, ctrlCtx *register.ControllerCtx) error {
 		ctrlCtx.RegisterResource = append(ctrlCtx.RegisterResource, &v1beta1.PodNetworking{})
 
 		err := builder.ControllerManagedBy(mgr).
-			Named(controllerName).
+			Named(ControllerName).
 			WithOptions(controller.Options{
 				MaxConcurrentReconciles: 1,
 			}).
@@ -76,7 +77,7 @@ type ReconcilePodNetworking struct {
 func NewReconcilePodNetworking(mgr manager.Manager, aliyunClient aliyunClient.OpenAPI, swPool *vswitch.SwitchPool) *ReconcilePodNetworking {
 	r := &ReconcilePodNetworking{
 		client:       mgr.GetClient(),
-		record:       mgr.GetEventRecorderFor("PodNetworking"),
+		record:       mgr.GetEventRecorderFor(utils.EventName(ControllerName)),
 		aliyunClient: aliyunClient,
 		swPool:       swPool,
 	}

pkg/controller/pod/pod_controller.go

@@ -56,26 +56,26 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 
-const controllerName = "pod"
+const ControllerName = "pod"
 const defaultInterface = "eth0"
 
 func init() {
-	register.Add(controllerName, func(mgr manager.Manager, ctrlCtx *register.ControllerCtx) error {
+	register.Add(ControllerName, func(mgr manager.Manager, ctrlCtx *register.ControllerCtx) error {
 		ctrlCtx.RegisterResource = append(ctrlCtx.RegisterResource, &corev1.Pod{})
 
 		crdMode := ctrlCtx.Config.IPAMType == types.IPAMTypeCRD
 
 		r := &ReconcilePod{
 			client:    mgr.GetClient(),
 			scheme:    mgr.GetScheme(),
-			record:    mgr.GetEventRecorderFor("TerwayPodController"),
+			record:    mgr.GetEventRecorderFor(utils.EventName(ControllerName)),
 			aliyun:    ctrlCtx.AliyunClient,
 			swPool:    ctrlCtx.VSwitchPool,
 			trunkMode: *ctrlCtx.Config.EnableTrunk,
 			crdMode:   crdMode,
 		}
 
-		c, err := controller.NewUnmanaged(controllerName, controller.Options{
+		c, err := controller.NewUnmanaged(ControllerName, controller.Options{
 			Reconciler:              r,
 			MaxConcurrentReconciles: ctrlCtx.Config.PodMaxConcurrent,
 		})

pkg/controller/pod/pod_controller_test.go

@@ -65,7 +65,7 @@ var _ = Describe("Pod controller", func() {
 
 	Context("Test init", func() {
 		It("register should succeed", func() {
-			v, ok := register.Controllers[controllerName]
+			v, ok := register.Controllers[ControllerName]
 			Expect(ok).To(BeTrue())
 
 			mgr, ctx := testutil.NewManager(cfg, openAPI, k8sClient)

pkg/utils/k8s.go

@@ -97,3 +97,7 @@ func RuntimeFinalStatus(status map[v1beta1.CNIStatus]*v1beta1.CNIStatusInfo) (cn
 	}
 	return
 }
+
+func EventName(name string)string{
+	return fmt.Sprintf("terway-controlplane/%s", name)
+}