From eba8a011d21dd7851d32c7fe1fc26d09cc443df0 Mon Sep 17 00:00:00 2001 From: Payam Qorbanpour Date: Mon, 8 Apr 2024 21:27:25 +0330 Subject: [PATCH] Replace resources names with suitable alternatives --- internal/controller/backup_controller.go | 6 +++--- internal/controller/cronbackup_controller.go | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/controller/backup_controller.go b/internal/controller/backup_controller.go index 8c3bb72..ac9827b 100644 --- a/internal/controller/backup_controller.go +++ b/internal/controller/backup_controller.go @@ -89,7 +89,7 @@ func (r *BackupReconciler) createBackupJob(ctx context.Context, backup *backupv1 job := &batchv1.Job{ ObjectMeta: metav1.ObjectMeta{ - Name: "gobackup-job", + Name: backup.Name, Namespace: backup.Namespace, }, Spec: batchv1.JobSpec{ @@ -103,7 +103,7 @@ func (r *BackupReconciler) createBackupJob(ctx context.Context, backup *backupv1 Command: []string{"/bin/sh", "-c", "gobackup perform"}, VolumeMounts: []corev1.VolumeMount{ { - Name: "gobackup-secret-volume", + Name: "config", MountPath: "/root/.gobackup", }, }, @@ -111,7 +111,7 @@ func (r *BackupReconciler) createBackupJob(ctx context.Context, backup *backupv1 }, Volumes: []corev1.Volume{ { - Name: "gobackup-secret-volume", + Name: "config", VolumeSource: corev1.VolumeSource{ Secret: &corev1.SecretVolumeSource{ SecretName: backup.BackupModelRef.Name, diff --git a/internal/controller/cronbackup_controller.go b/internal/controller/cronbackup_controller.go index 5e4200a..832e5a6 100644 --- a/internal/controller/cronbackup_controller.go +++ b/internal/controller/cronbackup_controller.go @@ -89,11 +89,11 @@ func (r *CronBackupReconciler) createBackupCronJob(ctx context.Context, cronback cronJob := &batchv1.CronJob{ ObjectMeta: metav1.ObjectMeta{ - Name: "gobackup-cronjob", + Name: cronbackup.Name, Namespace: cronbackup.Namespace, }, Spec: batchv1.CronJobSpec{ - Schedule: "*/1 * * * *", // Runs every minute + Schedule: cronbackup.BackupModelRef.Schedule.Cron, JobTemplate: batchv1.JobTemplateSpec{ Spec: batchv1.JobSpec{ Template: corev1.PodTemplateSpec{ @@ -106,7 +106,7 @@ func (r *CronBackupReconciler) createBackupCronJob(ctx context.Context, cronback Command: []string{"/bin/sh", "-c", "gobackup perform"}, VolumeMounts: []corev1.VolumeMount{ { - Name: "gobackup-secret-volume", + Name: "config", MountPath: "/root/.gobackup", }, }, @@ -114,7 +114,7 @@ func (r *CronBackupReconciler) createBackupCronJob(ctx context.Context, cronback }, Volumes: []corev1.Volume{ { - Name: "gobackup-secret-volume", + Name: "config", VolumeSource: corev1.VolumeSource{ Secret: &corev1.SecretVolumeSource{ SecretName: cronbackup.BackupModelRef.Name,