Skip to content

Commit fc594e3

Browse files
committed
add event records for controller
Signed-off-by: Andrey Kolkov <[email protected]>
1 parent af2859e commit fc594e3

3 files changed

Lines changed: 30 additions & 7 deletions

File tree

‎cmd/backup-controller/main.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,9 @@ func main() {
160160
}
161161

162162
if err = (&backupcontroller.BackupJobReconciler{
163-
Client: mgr.GetClient(),
164-
Scheme: mgr.GetScheme(),
163+
Client: mgr.GetClient(),
164+
Scheme: mgr.GetScheme(),
165+
Recorder: mgr.GetEventRecorderFor("backup-controller"),
165166
}).SetupWithManager(mgr); err != nil {
166167
setupLog.Error(err, "unable to create controller", "controller", "BackupJob")
167168
os.Exit(1)

‎internal/backupcontroller/backupjob_controller.go‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
apierrors "k8s.io/apimachinery/pkg/api/errors"
77
"k8s.io/apimachinery/pkg/runtime"
88
"k8s.io/apimachinery/pkg/types"
9+
"k8s.io/client-go/tools/record"
910
ctrl "sigs.k8s.io/controller-runtime"
1011
"sigs.k8s.io/controller-runtime/pkg/client"
1112
"sigs.k8s.io/controller-runtime/pkg/log"
@@ -18,13 +19,14 @@ import (
1819
// Velero.strategy.backups.cozystack.io objects.
1920
type BackupJobReconciler struct {
2021
client.Client
21-
Scheme *runtime.Scheme
22+
Scheme *runtime.Scheme
23+
Recorder record.EventRecorder
2224
}
2325

2426
func (r *BackupJobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
2527
logger := log.FromContext(ctx)
2628
logger.Info("reconciling BackupJob", "namespace", req.Namespace, "name", req.Name)
27-
29+
2830
j := &backupsv1alpha1.BackupJob{}
2931
err := r.Get(ctx, types.NamespacedName{Namespace: req.Namespace, Name: req.Name}, j)
3032
if err != nil {
@@ -35,20 +37,20 @@ func (r *BackupJobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
3537
logger.Error(err, "failed to get BackupJob")
3638
return ctrl.Result{}, err
3739
}
38-
40+
3941
if j.Spec.StrategyRef.APIGroup == nil {
4042
logger.V(1).Info("BackupJob has nil StrategyRef.APIGroup, skipping", "backupjob", j.Name)
4143
return ctrl.Result{}, nil
4244
}
43-
45+
4446
if *j.Spec.StrategyRef.APIGroup != strategyv1alpha1.GroupVersion.Group {
4547
logger.V(1).Info("BackupJob StrategyRef.APIGroup doesn't match, skipping",
4648
"backupjob", j.Name,
4749
"expected", strategyv1alpha1.GroupVersion.Group,
4850
"got", *j.Spec.StrategyRef.APIGroup)
4951
return ctrl.Result{}, nil
5052
}
51-
53+
5254
logger.Info("processing BackupJob", "backupjob", j.Name, "strategyKind", j.Spec.StrategyRef.Kind)
5355
switch j.Spec.StrategyRef.Kind {
5456
case strategyv1alpha1.JobStrategyKind:

‎internal/backupcontroller/velerostrategy_controller.go‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,17 +334,25 @@ s3 =
334334
if err != nil && errors.IsNotFound(err) {
335335
// Create the Secret
336336
if err := r.Create(ctx, secret); err != nil {
337+
r.Recorder.Event(backupJob, corev1.EventTypeWarning, "SecretCreationFailed",
338+
fmt.Sprintf("Failed to create Velero credentials secret %s/%s: %v", secretNamespace, secretName, err))
337339
return fmt.Errorf("failed to create Velero credentials secret: %w", err)
338340
}
339341
logger.Info("created Velero credentials secret", "secret", secretName)
342+
r.Recorder.Event(backupJob, corev1.EventTypeNormal, "SecretCreated",
343+
fmt.Sprintf("Created Velero credentials secret %s/%s", secretNamespace, secretName))
340344
} else if err == nil {
341345
// Update if necessary
342346
foundSecret.StringData = secret.StringData
343347
foundSecret.Data = nil // Clear .Data so .StringData will be used
344348
if err := r.Update(ctx, foundSecret); err != nil {
349+
r.Recorder.Event(backupJob, corev1.EventTypeWarning, "SecretUpdateFailed",
350+
fmt.Sprintf("Failed to update Velero credentials secret %s/%s: %v", secretNamespace, secretName, err))
345351
return fmt.Errorf("failed to update Velero credentials secret: %w", err)
346352
}
347353
logger.Info("updated Velero credentials secret", "secret", secretName)
354+
r.Recorder.Event(backupJob, corev1.EventTypeNormal, "SecretUpdated",
355+
fmt.Sprintf("Updated Velero credentials secret %s/%s", secretNamespace, secretName))
348356
} else if err != nil {
349357
return fmt.Errorf("error checking for existing Velero credentials secret: %w", err)
350358
}
@@ -525,8 +533,12 @@ func (r *BackupJobReconciler) createVeleroBackup(ctx context.Context, backupJob
525533
// Create or update the BackupStorageLocation
526534
if err := r.createBackupStorageLocation(ctx, bsl); err != nil {
527535
logger.Error(err, "failed to create or update BackupStorageLocation for Velero")
536+
r.Recorder.Event(backupJob, corev1.EventTypeWarning, "BackupStorageLocationCreationFailed",
537+
fmt.Sprintf("Failed to create or update BackupStorageLocation %s/%s: %v", veleroNamespace, locationName, err))
528538
return fmt.Errorf("failed to create or update Velero BackupStorageLocation: %w", err)
529539
}
540+
r.Recorder.Event(backupJob, corev1.EventTypeNormal, "BackupStorageLocationCreated",
541+
fmt.Sprintf("Created or updated BackupStorageLocation %s/%s", veleroNamespace, locationName))
530542

531543
// VolumeSnapshotLocation manifest
532544
// Note: Cannot set owner reference for cross-namespace resources
@@ -553,8 +565,12 @@ func (r *BackupJobReconciler) createVeleroBackup(ctx context.Context, backupJob
553565
// Create or update the VolumeSnapshotLocation
554566
if err := r.createVolumeSnapshotLocation(ctx, vsl); err != nil {
555567
logger.Error(err, "failed to create or update VolumeSnapshotLocation for Velero")
568+
r.Recorder.Event(backupJob, corev1.EventTypeWarning, "VolumeSnapshotLocationCreationFailed",
569+
fmt.Sprintf("Failed to create or update VolumeSnapshotLocation %s/%s: %v", veleroNamespace, locationName, err))
556570
return fmt.Errorf("failed to create or update Velero VolumeSnapshotLocation: %w", err)
557571
}
572+
r.Recorder.Event(backupJob, corev1.EventTypeNormal, "VolumeSnapshotLocationCreated",
573+
fmt.Sprintf("Created or updated VolumeSnapshotLocation %s/%s", veleroNamespace, locationName))
558574
}
559575

560576
// Create a Velero Backup (velero.io/v1) using typed object
@@ -581,10 +597,14 @@ func (r *BackupJobReconciler) createVeleroBackup(ctx context.Context, backupJob
581597

582598
if err := r.Create(ctx, veleroBackup); err != nil {
583599
logger.Error(err, "failed to create Velero Backup", "name", veleroBackup.Name)
600+
r.Recorder.Event(backupJob, corev1.EventTypeWarning, "VeleroBackupCreationFailed",
601+
fmt.Sprintf("Failed to create Velero Backup %s/%s: %v", veleroNamespace, name, err))
584602
return err
585603
}
586604

587605
logger.Info("created Velero Backup", "name", veleroBackup.Name, "namespace", veleroBackup.Namespace)
606+
r.Recorder.Event(backupJob, corev1.EventTypeNormal, "VeleroBackupCreated",
607+
fmt.Sprintf("Created Velero Backup %s/%s", veleroNamespace, name))
588608
return nil
589609
}
590610

0 commit comments

Comments
 (0)