Fix typos and clean code

Signed-off-by: Ales Raszka <[email protected]>

Author: Allda

controllers/backupcronjob/backupcronjob_controller.go

@@ -210,7 +210,7 @@ func (r *BackupCronJobReconciler) stopCron(log logr.Logger) {
 func (r *BackupCronJobReconciler) executeBackupSync(ctx context.Context, dwOperatorConfig *controllerv1alpha1.DevWorkspaceOperatorConfig, log logr.Logger) error {
 	log.Info("Executing backup sync for all DevWorkspaces")
 
-	registyAuthSecret, err := r.getRegistryAuthSecret(ctx, dwOperatorConfig, log)
+	registryAuthSecret, err := r.getRegistryAuthSecret(ctx, dwOperatorConfig, log)
 	if err != nil {
 		log.Error(err, "Failed to get registry auth secret for backup job")
 		return err
@@ -239,7 +239,7 @@ func (r *BackupCronJobReconciler) executeBackupSync(ctx context.Context, dwOpera
 			continue
 		}
 
-		if err := r.createBackupJob(&dw, ctx, dwOperatorConfig, registyAuthSecret, log); err != nil {
+		if err := r.createBackupJob(&dw, ctx, dwOperatorConfig, registryAuthSecret, log); err != nil {
 			log.Error(err, "Failed to create backup Job for DevWorkspace", "id", dwID)
 			continue
 		}
@@ -310,7 +310,7 @@ func (r *BackupCronJobReconciler) createBackupJob(
 	workspace *dw.DevWorkspace,
 	ctx context.Context,
 	dwOperatorConfig *controllerv1alpha1.DevWorkspaceOperatorConfig,
-	registyAuthSecret *corev1.Secret,
+	registryAuthSecret *corev1.Secret,
 	log logr.Logger,
 ) error {
 	dwID := workspace.Status.DevWorkspaceId
@@ -407,8 +407,8 @@ func (r *BackupCronJobReconciler) createBackupJob(
 			},
 		},
 	}
-	if registyAuthSecret != nil {
-		secret, err := r.copySecret(workspace, ctx, registyAuthSecret, log)
+	if registryAuthSecret != nil {
+		secret, err := r.copySecret(workspace, ctx, registryAuthSecret, log)
 		if err != nil {
 			return err
 		}

controllers/backupcronjob/backupcronjob_controller_test.go

@@ -111,7 +111,7 @@ var _ = Describe("BackupCronJobReconciler", func() {
 							Enable:   pointer.Bool(true),
 							Schedule: "* * * * *",
 							Registry: &controllerv1alpha1.RegistryConfig{
-								Path: "fake-registy",
+								Path: "fake-registry",
 							},
 						},
 					},
@@ -138,7 +138,7 @@ var _ = Describe("BackupCronJobReconciler", func() {
 							Enable:   &enabled,
 							Schedule: schedule,
 							Registry: &controllerv1alpha1.RegistryConfig{
-								Path: "fake-registy",
+								Path: "fake-registry",
 							},
 						},
 					},
@@ -163,7 +163,7 @@ var _ = Describe("BackupCronJobReconciler", func() {
 							Enable:   &enabled,
 							Schedule: schedule1,
 							Registry: &controllerv1alpha1.RegistryConfig{
-								Path: "fake-registy",
+								Path: "fake-registry",
 							},
 						},
 					},
@@ -199,7 +199,7 @@ var _ = Describe("BackupCronJobReconciler", func() {
 							Enable:   &enabled,
 							Schedule: schedule,
 							Registry: &controllerv1alpha1.RegistryConfig{
-								Path: "fake-registy",
+								Path: "fake-registry",
 							},
 						},
 					},
@@ -223,7 +223,7 @@ var _ = Describe("BackupCronJobReconciler", func() {
 	})
 
 	Context("executeBackupSync", func() {
-		It("creates a Job for a DevWorkspace stopped with no previsou backup", func() {
+		It("creates a Job for a DevWorkspace stopped with no previous backup", func() {
 			enabled := true
 			schedule := "* * * * *"
 			dwoc := &controllerv1alpha1.DevWorkspaceOperatorConfig{
@@ -234,7 +234,7 @@ var _ = Describe("BackupCronJobReconciler", func() {
 							Enable:   &enabled,
 							Schedule: schedule,
 							Registry: &controllerv1alpha1.RegistryConfig{
-								Path: "fake-registy",
+								Path: "fake-registry",
 							},
 						},
 					},
@@ -267,7 +267,7 @@ var _ = Describe("BackupCronJobReconciler", func() {
 							Enable:   &enabled,
 							Schedule: schedule,
 							Registry: &controllerv1alpha1.RegistryConfig{
-								Path: "fake-registy",
+								Path: "fake-registry",
 							},
 						},
 					},
@@ -302,7 +302,7 @@ var _ = Describe("BackupCronJobReconciler", func() {
 							Enable:   &enabled,
 							Schedule: schedule,
 							Registry: &controllerv1alpha1.RegistryConfig{
-								Path: "fake-registy",
+								Path: "fake-registry",
 							},
 						},
 					},
@@ -321,7 +321,7 @@ var _ = Describe("BackupCronJobReconciler", func() {
 			Expect(jobList.Items).To(HaveLen(0))
 		})
 
-		It("creates a Job for a DevWorkspace stopped with no previsou backup and auth registry", func() {
+		It("creates a Job for a DevWorkspace stopped with no previous backup and auth registry", func() {
 			enabled := true
 			schedule := "* * * * *"
 			dwoc := &controllerv1alpha1.DevWorkspaceOperatorConfig{
@@ -393,14 +393,12 @@ func createDevWorkspace(name, namespace string, started bool, lastTransitionTime
 }
 
 func createAuthSecret(name, namespace string, data map[string][]byte) *corev1.Secret {
-	{
-		return &corev1.Secret{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      name,
-				Namespace: namespace,
-			},
-			Data: data,
-		}
+	return &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: namespace,
+		},
+		Data: data,
 	}
 }
 

controllers/backupcronjob/rbac.go

@@ -31,11 +31,6 @@ const (
 )
 
 func (r *BackupCronJobReconciler) ensureJobRunnerRBAC(ctx context.Context, workspace *dw.DevWorkspace) error {
-	const (
-		roleName = "devworkspace-job-runner-role"
-		rbName   = "devworkspace-job-runner-rolebinding"
-	)
-
 	sa := &corev1.ServiceAccount{
 		ObjectMeta: metav1.ObjectMeta{Name: JobRunnerSAName + "-" + workspace.Status.DevWorkspaceId, Namespace: workspace.Namespace, Labels: map[string]string{
 			constants.DevWorkspaceIDLabel:          workspace.Status.DevWorkspaceId,

pkg/config/defaults.go

@@ -85,9 +85,6 @@ var defaultConfig = &v1alpha1.OperatorConfiguration{
 		BackupCronJob: &v1alpha1.BackupCronJobConfig{
 			Enable:   pointer.Bool(false),
 			Schedule: "0 0 1 * *",
-			Registry: &v1alpha1.RegistryConfig{
-				Path: "sample.com",
-			},
 		},
 		// Do not declare a default value for this field.
 		// Setting a default leads to an endless reconcile loop when UserNamespacesSupport is disabled,

pkg/config/sync.go

@@ -441,14 +441,16 @@ func mergeConfig(from, to *controller.OperatorConfiguration) {
 			if from.Workspace.BackupCronJob.Schedule != "" {
 				to.Workspace.BackupCronJob.Schedule = from.Workspace.BackupCronJob.Schedule
 			}
-			if to.Workspace.BackupCronJob.Registry == nil {
-				to.Workspace.BackupCronJob.Registry = &controller.RegistryConfig{}
-			}
-			if from.Workspace.BackupCronJob.Registry.Path != "" {
-				to.Workspace.BackupCronJob.Registry.Path = from.Workspace.BackupCronJob.Registry.Path
-			}
-			if from.Workspace.BackupCronJob.Registry.AuthSecret != "" {
-				to.Workspace.BackupCronJob.Registry.AuthSecret = from.Workspace.BackupCronJob.Registry.AuthSecret
+			if from.Workspace.BackupCronJob.Registry != nil {
+				if to.Workspace.BackupCronJob.Registry == nil {
+					to.Workspace.BackupCronJob.Registry = &controller.RegistryConfig{}
+				}
+				if from.Workspace.BackupCronJob.Registry.Path != "" {
+					to.Workspace.BackupCronJob.Registry.Path = from.Workspace.BackupCronJob.Registry.Path
+				}
+				if from.Workspace.BackupCronJob.Registry.AuthSecret != "" {
+					to.Workspace.BackupCronJob.Registry.AuthSecret = from.Workspace.BackupCronJob.Registry.AuthSecret
+				}
 			}
 		}