mirror of
https://github.com/stakater/Reloader.git
synced 2026-08-20 04:26:28 +00:00
migrate recorder to new api
This commit is contained in:
@@ -152,7 +152,7 @@ func SetupReconcilers(mgr ctrl.Manager, cfg *config.Config, log logr.Logger, col
|
||||
},
|
||||
)
|
||||
reloadService := reload.NewService(cfg, log.WithName("reload"))
|
||||
eventRecorder := events.NewRecorder(mgr.GetEventRecorderFor("reloader"))
|
||||
eventRecorder := events.NewRecorder(mgr.GetEventRecorder("reloader"))
|
||||
pauseHandler := reload.NewPauseHandler(cfg)
|
||||
|
||||
// Create alerter based on configuration
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
package events
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/client-go/tools/record"
|
||||
"k8s.io/client-go/tools/events"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -18,15 +16,18 @@ const (
|
||||
ReasonReloaded = "Reloaded"
|
||||
// ReasonReloadFailed indicates a workload reload failed.
|
||||
ReasonReloadFailed = "ReloadFailed"
|
||||
|
||||
// actionReloading is the action reported on reload events.
|
||||
actionReloading = "Reloading"
|
||||
)
|
||||
|
||||
// Recorder wraps the Kubernetes event recorder.
|
||||
type Recorder struct {
|
||||
recorder record.EventRecorder
|
||||
recorder events.EventRecorder
|
||||
}
|
||||
|
||||
// NewRecorder creates a new event Recorder.
|
||||
func NewRecorder(recorder record.EventRecorder) *Recorder {
|
||||
func NewRecorder(recorder events.EventRecorder) *Recorder {
|
||||
if recorder == nil {
|
||||
return nil
|
||||
}
|
||||
@@ -38,11 +39,13 @@ func (r *Recorder) ReloadSuccess(object runtime.Object, resourceType, resourceNa
|
||||
if r == nil || r.recorder == nil {
|
||||
return
|
||||
}
|
||||
r.recorder.Event(
|
||||
r.recorder.Eventf(
|
||||
object,
|
||||
nil,
|
||||
EventTypeNormal,
|
||||
ReasonReloaded,
|
||||
fmt.Sprintf("Reloaded due to %s %s change", resourceType, resourceName),
|
||||
actionReloading,
|
||||
"Reloaded due to %s %s change", resourceType, resourceName,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -51,10 +54,12 @@ func (r *Recorder) ReloadFailed(object runtime.Object, resourceType, resourceNam
|
||||
if r == nil || r.recorder == nil {
|
||||
return
|
||||
}
|
||||
r.recorder.Event(
|
||||
r.recorder.Eventf(
|
||||
object,
|
||||
nil,
|
||||
EventTypeWarning,
|
||||
ReasonReloadFailed,
|
||||
fmt.Sprintf("Failed to reload due to %s %s change: %v", resourceType, resourceName, err),
|
||||
actionReloading,
|
||||
"Failed to reload due to %s %s change: %v", resourceType, resourceName, err,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/client-go/tools/record"
|
||||
k8sevents "k8s.io/client-go/tools/events"
|
||||
)
|
||||
|
||||
func TestNewRecorder_NilInput(t *testing.T) {
|
||||
@@ -18,7 +18,7 @@ func TestNewRecorder_NilInput(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestNewRecorder_ValidInput(t *testing.T) {
|
||||
fakeRecorder := record.NewFakeRecorder(10)
|
||||
fakeRecorder := k8sevents.NewFakeRecorder(10)
|
||||
r := NewRecorder(fakeRecorder)
|
||||
if r == nil {
|
||||
t.Error("NewRecorder with valid recorder should not return nil")
|
||||
@@ -26,7 +26,7 @@ func TestNewRecorder_ValidInput(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestReloadSuccess_RecordsEvent(t *testing.T) {
|
||||
fakeRecorder := record.NewFakeRecorder(10)
|
||||
fakeRecorder := k8sevents.NewFakeRecorder(10)
|
||||
r := NewRecorder(fakeRecorder)
|
||||
|
||||
pod := &corev1.Pod{
|
||||
@@ -56,7 +56,7 @@ func TestReloadSuccess_RecordsEvent(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestReloadFailed_RecordsWarningEvent(t *testing.T) {
|
||||
fakeRecorder := record.NewFakeRecorder(10)
|
||||
fakeRecorder := k8sevents.NewFakeRecorder(10)
|
||||
r := NewRecorder(fakeRecorder)
|
||||
|
||||
pod := &corev1.Pod{
|
||||
@@ -116,7 +116,7 @@ func TestRecorder_NilInternalRecorder(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestReloadSuccess_DifferentObjectTypes(t *testing.T) {
|
||||
fakeRecorder := record.NewFakeRecorder(10)
|
||||
fakeRecorder := k8sevents.NewFakeRecorder(10)
|
||||
r := NewRecorder(fakeRecorder)
|
||||
|
||||
tests := []struct {
|
||||
|
||||
Reference in New Issue
Block a user