Skip to content

Commit d8d74d3

Browse files
l1b0kl1b0k
committed
feat: update event recorder names and controller names for terway control plane components
Signed-off-by: l1b0k <libokang.lbk@alibaba-inc.com>
1 parent e3d10ff commit d8d74d3

File tree

11 files changed

+67
-22
lines changed

11 files changed

+67
-22
lines changed

‎pkg/controller/eni/eni.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
"github.com/AliyunContainerService/terway/pkg/backoff"
3030
register "github.com/AliyunContainerService/terway/pkg/controller"
3131
"github.com/AliyunContainerService/terway/pkg/controller/common"
32+
"github.com/AliyunContainerService/terway/pkg/utils"
3233
"github.com/AliyunContainerService/terway/types"
3334
"github.com/AliyunContainerService/terway/types/controlplane"
3435
)
@@ -45,14 +46,14 @@ type ReconcileNetworkInterface struct {
4546
resourceBackoff *BackoffManager
4647
}
4748

48-
const controllerName = "eni"
49+
const ControllerName = "eni"
4950

5051
func init() {
51-
register.Add(controllerName, func(mgr manager.Manager, ctrlCtx *register.ControllerCtx) error {
52+
register.Add(ControllerName, func(mgr manager.Manager, ctrlCtx *register.ControllerCtx) error {
5253
ctrlCtx.RegisterResource = append(ctrlCtx.RegisterResource, &v1beta1.NetworkInterface{})
5354

5455
err := builder.ControllerManagedBy(mgr).
55-
Named(controllerName).
56+
Named(ControllerName).
5657
WithOptions(controller.Options{
5758
MaxConcurrentReconciles: controlplane.GetConfig().ENIMaxConcurrent,
5859
LogConstructor: func(request *reconcile.Request) logr.Logger {
@@ -69,7 +70,7 @@ func init() {
6970
client: mgr.GetClient(),
7071
scheme: mgr.GetScheme(),
7172
aliyun: ctrlCtx.AliyunClient, // use direct client
72-
record: mgr.GetEventRecorderFor("TerwayENetworkInterfaceontroller"),
73+
record: mgr.GetEventRecorderFor(utils.EventName(ControllerName)),
7374
resourceBackoff: NewBackoffManager(),
7475
})
7576

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func init() {
142142
Reconciler: &ReconcileNode{
143143
client: mgr.GetClient(),
144144
scheme: mgr.GetScheme(),
145-
record: mgr.GetEventRecorderFor(ControllerName),
145+
record: mgr.GetEventRecorderFor(utils.EventName(ControllerName)),
146146
aliyun: ctrlCtx.AliyunClient,
147147
vswpool: ctrlCtx.VSwitchPool,
148148
fullSyncNodePeriod: fullSyncPeriod,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package pod
33
import (
44
"context"
55

6+
"github.com/AliyunContainerService/terway/pkg/utils"
67
corev1 "k8s.io/api/core/v1"
78
k8sErr "k8s.io/apimachinery/pkg/api/errors"
89
"k8s.io/apimachinery/pkg/runtime"
@@ -32,7 +33,7 @@ func init() {
3233
Complete(&ReconcilePod{
3334
client: mgr.GetClient(),
3435
scheme: mgr.GetScheme(),
35-
record: mgr.GetEventRecorderFor(ControllerName),
36+
record: mgr.GetEventRecorderFor(utils.EventName(ControllerName)),
3637
})
3738
}, false)
3839
}

‎pkg/controller/node/node.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func init() {
7777
Complete(&ReconcileNode{
7878
client: mgr.GetClient(),
7979
scheme: mgr.GetScheme(),
80-
record: mgr.GetEventRecorderFor(ControllerName),
80+
record: mgr.GetEventRecorderFor(utils.EventName(ControllerName)),
8181
aliyun: ctrlCtx.AliyunClient,
8282
supportEFLO: utilfeature.DefaultMutableFeatureGate.Enabled(feature.EFLO),
8383
nodePredicate: nodePredicate,

‎pkg/controller/pod-eni/eni_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,25 +62,25 @@ import (
6262
"github.com/AliyunContainerService/terway/types/controlplane"
6363
)
6464

65-
var ctrlLog = ctrl.Log.WithName(controllerName)
65+
var ctrlLog = ctrl.Log.WithName(ControllerName)
6666

67-
const controllerName = "pod-eni"
67+
const ControllerName = "pod-eni"
6868
const layout = "2006-01-02T15:04:05Z"
6969

7070
func init() {
71-
register.Add(controllerName, func(mgr manager.Manager, ctrlCtx *register.ControllerCtx) error {
71+
register.Add(ControllerName, func(mgr manager.Manager, ctrlCtx *register.ControllerCtx) error {
7272
ctrlCtx.RegisterResource = append(ctrlCtx.RegisterResource, &v1beta1.PodENI{})
7373

7474
r := &ReconcilePodENI{
7575
client: mgr.GetClient(),
7676
scheme: mgr.GetScheme(),
77-
record: mgr.GetEventRecorderFor("TerwayPodENIController"),
77+
record: mgr.GetEventRecorderFor(utils.EventName(ControllerName)),
7878
aliyun: ctrlCtx.AliyunClient,
7979
trunkMode: *ctrlCtx.Config.EnableTrunk,
8080
crdMode: ctrlCtx.Config.IPAMType == types.IPAMTypeCRD,
8181
nodeStatusCache: ctrlCtx.NodeStatusCache,
8282
}
83-
c, err := controller.NewUnmanaged(controllerName, controller.Options{
83+
c, err := controller.NewUnmanaged(ControllerName, controller.Options{
8484
Reconciler: r,
8585
MaxConcurrentReconciles: ctrlCtx.Config.PodENIMaxConcurrent,
8686
})

‎pkg/controller/pod-eni/eni_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ var _ = Describe("ENI Controller Tests", func() {
115115

116116
Context("Test init", func() {
117117
It("register should succeed", func() {
118-
v, ok := register.Controllers[controllerName]
118+
v, ok := register.Controllers[ControllerName]
119119
Expect(ok).To(BeTrue())
120120

121121
mgr, ctx := testutil.NewManager(cfg, openAPI, k8sClient)

‎pkg/controller/pod-networking/networking.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"context"
2121
"time"
2222

23+
"github.com/AliyunContainerService/terway/pkg/utils"
2324
"sigs.k8s.io/controller-runtime/pkg/builder"
2425

2526
aliyunClient "github.com/AliyunContainerService/terway/pkg/aliyun/client"
@@ -41,14 +42,14 @@ import (
4142
"sigs.k8s.io/controller-runtime/pkg/reconcile"
4243
)
4344

44-
const controllerName = "pod-networking"
45+
const ControllerName = "pod-networking"
4546

4647
func init() {
47-
register.Add(controllerName, func(mgr manager.Manager, ctrlCtx *register.ControllerCtx) error {
48+
register.Add(ControllerName, func(mgr manager.Manager, ctrlCtx *register.ControllerCtx) error {
4849
ctrlCtx.RegisterResource = append(ctrlCtx.RegisterResource, &v1beta1.PodNetworking{})
4950

5051
err := builder.ControllerManagedBy(mgr).
51-
Named(controllerName).
52+
Named(ControllerName).
5253
WithOptions(controller.Options{
5354
MaxConcurrentReconciles: 1,
5455
}).
@@ -76,7 +77,7 @@ type ReconcilePodNetworking struct {
7677
func NewReconcilePodNetworking(mgr manager.Manager, aliyunClient aliyunClient.OpenAPI, swPool *vswitch.SwitchPool) *ReconcilePodNetworking {
7778
r := &ReconcilePodNetworking{
7879
client: mgr.GetClient(),
79-
record: mgr.GetEventRecorderFor("PodNetworking"),
80+
record: mgr.GetEventRecorderFor(utils.EventName(ControllerName)),
8081
aliyunClient: aliyunClient,
8182
swPool: swPool,
8283
}

‎pkg/controller/pod/pod_controller.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,26 +56,26 @@ import (
5656
"sigs.k8s.io/controller-runtime/pkg/source"
5757
)
5858

59-
const controllerName = "pod"
59+
const ControllerName = "pod"
6060
const defaultInterface = "eth0"
6161

6262
func init() {
63-
register.Add(controllerName, func(mgr manager.Manager, ctrlCtx *register.ControllerCtx) error {
63+
register.Add(ControllerName, func(mgr manager.Manager, ctrlCtx *register.ControllerCtx) error {
6464
ctrlCtx.RegisterResource = append(ctrlCtx.RegisterResource, &corev1.Pod{})
6565

6666
crdMode := ctrlCtx.Config.IPAMType == types.IPAMTypeCRD
6767

6868
r := &ReconcilePod{
6969
client: mgr.GetClient(),
7070
scheme: mgr.GetScheme(),
71-
record: mgr.GetEventRecorderFor("TerwayPodController"),
71+
record: mgr.GetEventRecorderFor(utils.EventName(ControllerName)),
7272
aliyun: ctrlCtx.AliyunClient,
7373
swPool: ctrlCtx.VSwitchPool,
7474
trunkMode: *ctrlCtx.Config.EnableTrunk,
7575
crdMode: crdMode,
7676
}
7777

78-
c, err := controller.NewUnmanaged(controllerName, controller.Options{
78+
c, err := controller.NewUnmanaged(ControllerName, controller.Options{
7979
Reconciler: r,
8080
MaxConcurrentReconciles: ctrlCtx.Config.PodMaxConcurrent,
8181
})

‎pkg/controller/pod/pod_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ var _ = Describe("Pod controller", func() {
6565

6666
Context("Test init", func() {
6767
It("register should succeed", func() {
68-
v, ok := register.Controllers[controllerName]
68+
v, ok := register.Controllers[ControllerName]
6969
Expect(ok).To(BeTrue())
7070

7171
mgr, ctx := testutil.NewManager(cfg, openAPI, k8sClient)

‎pkg/utils/k8s.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,7 @@ func RuntimeFinalStatus(status map[v1beta1.CNIStatus]*v1beta1.CNIStatusInfo) (cn
9797
}
9898
return
9999
}
100+
101+
func EventName(name string) string {
102+
return fmt.Sprintf("terway-controlplane/%s", name)
103+
}

0 commit comments

Comments
 (0)