From 48f13d6255177e130fdbded1fde39b7177f59af0 Mon Sep 17 00:00:00 2001 From: Kyriakos Akriotis Date: Tue, 28 May 2024 20:39:40 +0200 Subject: [PATCH] recording events for sleepcycles and runners --- controllers/sleepcycle_utils.go | 4 ++-- runners/runner.go | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/controllers/sleepcycle_utils.go b/controllers/sleepcycle_utils.go index e53ff84..dda780b 100644 --- a/controllers/sleepcycle_utils.go +++ b/controllers/sleepcycle_utils.go @@ -33,11 +33,11 @@ func (r *SleepCycleReconciler) generateToken() (string, error) { func (r *SleepCycleReconciler) recordEvent(sleepCycle *corev1alpha1.SleepCycle, message string, isError bool) { eventType := corev1.EventTypeNormal - reason := "SleepCycleOpSuccess" + reason := "SuccessfulSleepCycleReconcile" if isError { eventType = corev1.EventTypeWarning - reason = "SleepCycleOpFailure" + reason = "FailedSleepCycleReconcile" } r.Recorder.Event(sleepCycle, eventType, reason, strings.ToLower(message)) diff --git a/runners/runner.go b/runners/runner.go index a0d3d70..46a72a8 100644 --- a/runners/runner.go +++ b/runners/runner.go @@ -20,6 +20,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" "strconv" "strings" + "time" ) var ( @@ -77,14 +78,14 @@ func main() { clientSet = cs scheme := runtime.NewScheme() - _ = corev1.AddToScheme(scheme) + _ = batchv1.AddToScheme(scheme) eventBroadcaster := record.NewBroadcaster() defer eventBroadcaster.Shutdown() eventBroadcaster.StartStructuredLogging(4) eventBroadcaster.StartRecordingToSink(&typedv1core.EventSinkImpl{Interface: clientSet.CoreV1().Events("")}) - eventRecorder = eventBroadcaster.NewRecorder(scheme, corev1.EventSource{}) + eventRecorder = eventBroadcaster.NewRecorder(scheme, corev1.EventSource{Component: "rekuberate-io/sleepcycles-runner"}) cronjob, err := clientSet.BatchV1().CronJobs(ns).Get(ctx, cj, metav1.GetOptions{}) if err != nil { @@ -312,12 +313,13 @@ func scaleHorizontalPodAutoscalers(ctx context.Context, namespace string, cronjo func recordEvent(cronjob *batchv1.CronJob, message string, isError bool) { eventType := corev1.EventTypeNormal - reason := "SleepCycleOpSuccess" + reason := "SuccessfulSleepCycleScale" if isError { eventType = corev1.EventTypeWarning - reason = "SleepCycleOpFailure" + reason = "FailedSleepCycleScale" } eventRecorder.Event(cronjob, eventType, reason, strings.ToLower(message)) + time.Sleep(2 * time.Second) }