Address Anatolii's comments

- Moving extraArgs to Oras config section
- Unify default values
- Change UBI base image
- Use constant for the PVC name

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

Author: Allda

apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go

@@ -83,7 +83,9 @@ type RegistryConfig struct {
 	// as the DevWorkspaceOperatorCongfig.
 	// +kubebuilder:validation:Optional
 	AuthSecret string `json:"authSecret,omitempty"`
+}
 
+type OrasConfig struct {
 	// ExtraArgs are additional arguments passed to the oras CLI
 	// +kubebuilder:validation:Optional
 	ExtraArgs string `json:"extraArgs,omitempty"`
@@ -97,9 +99,12 @@ type BackupCronJobConfig struct {
 	// RegistryConfig defines the registry configuration where backup images are stored.
 	// +kubebuilder:validation:Required
 	Registry *RegistryConfig `json:"registry,omitempty"`
+	// OrasConfig defines additional configuration options for the oras CLI used to
+	// push and pull backup images.
+	OrasConfig *OrasConfig `json:"oras,omitempty"`
 	// Schedule specifies the cron schedule for the backup cron job.
-	// For example, "0 2 * * *" runs daily at 2 AM.
-	// +kubebuilder:default:="0 2 * * *"
+	// For example, "0 1 * * *" runs daily at 1 AM.
+	// +kubebuilder:default:="0 1 * * *"
 	// +kubebuilder:validation:Optional
 	Schedule string `json:"schedule,omitempty"`
 }

apis/controller/v1alpha1/zz_generated.deepcopy.go

@@ -333,6 +333,10 @@ func (r *BackupCronJobReconciler) createBackupJob(
 		log.Error(err, "Failed to get PVC for DevWorkspace", "id", dwID)
 		return err
 	}
+	orasExtraArgs := ""
+	if backUpConfig.OrasConfig != nil {
+		orasExtraArgs = backUpConfig.OrasConfig.ExtraArgs
+	}
 
 	job := &batchv1.Job{
 		ObjectMeta: metav1.ObjectMeta{
@@ -365,7 +369,7 @@ func (r *BackupCronJobReconciler) createBackupJob(
 									Value: "/workspace/" + workspacePath,
 								},
 								{Name: "DEVWORKSPACE_BACKUP_REGISTRY", Value: backUpConfig.Registry.Path},
-								{Name: "ORAS_EXTRA_ARGS", Value: backUpConfig.Registry.ExtraArgs},
+								{Name: "ORAS_EXTRA_ARGS", Value: orasExtraArgs},
 							},
 							Image:           images.GetProjectBackupImage(),
 							ImagePullPolicy: "Always",
@@ -461,7 +465,7 @@ func (r *BackupCronJobReconciler) getWorkspacePVCName(workspace *dw.DevWorkspace
 		return pvcName, constants.DefaultProjectsSourcesRoot, nil
 
 	} else if _, ok := storageProvisioner.(*storage.CommonStorageProvisioner); ok {
-		pvcName := "claim-devworkspace"
+		pvcName := constants.DefaultWorkspacePVCName
 		if dwOperatorConfig.Config.Workspace.PVCName != "" {
 			pvcName = dwOperatorConfig.Config.Workspace.PVCName
 		}

controllers/backupcronjob/backupcronjob_controller.go

@@ -320,8 +320,10 @@ var _ = Describe("BackupCronJobReconciler", func() {
 							Enable:   &enabled,
 							Schedule: schedule,
 							Registry: &controllerv1alpha1.RegistryConfig{
-								Path:      "fake-registry",
-								ExtraArgs: "--exta-arg1",
+								Path: "fake-registry",
+							},
+							OrasConfig: &controllerv1alpha1.OrasConfig{
+								ExtraArgs: "--extra-arg1",
 							},
 						},
 					},
@@ -350,7 +352,7 @@ var _ = Describe("BackupCronJobReconciler", func() {
 				{Name: "WORKSPACE_ID", Value: "id-recent"},
 				{Name: "BACKUP_SOURCE_PATH", Value: "/workspace/id-recent/projects"},
 				{Name: "DEVWORKSPACE_BACKUP_REGISTRY", Value: "fake-registry"},
-				{Name: "ORAS_EXTRA_ARGS", Value: "--exta-arg1"},
+				{Name: "ORAS_EXTRA_ARGS", Value: "--extra-arg1"},
 			}
 			Expect(container.Env).Should(ContainElements(expectedEnvs), "container env vars should include vars neeeded for backup")