fixup! fixup! fixup! fixup! fixup! fix

Signed-off-by: Oleksii Kurinnyi <[email protected]>

Author: akurinnoy

controllers/workspace/devworkspace_controller.go

@@ -68,19 +68,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
-// ensureHomeInitContainerFields ensures that an init-persistent-home container has
-// the correct Command and VolumeMounts.
-func ensureHomeInitContainerFields(c *corev1.Container) error {
-	// Set default command only if not provided
-	if len(c.Command) == 0 {
-		c.Command = []string{"/bin/sh", "-c"}
-	}
-	c.VolumeMounts = []corev1.VolumeMount{{
-		Name:      constants.HomeVolumeName,
-		MountPath: constants.HomeUserDirectory,
-	}}
-	return nil
-}
 
 const (
 	startingWorkspaceRequeueInterval = 5 * time.Second
@@ -416,7 +403,7 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		// Ensure init-persistent-home container has correct fields after merge
 		for i := range merged {
 			if merged[i].Name == constants.HomeInitComponentName {
-				if err := ensureHomeInitContainerFields(&merged[i]); err != nil {
+				if err := home.EnsureHomeInitContainerFields(&merged[i]); err != nil {
 					return r.failWorkspace(workspace, fmt.Sprintf("Failed to configure %s container: %s", constants.HomeInitComponentName, err), metrics.ReasonBadRequest, reqLogger, &reconcileStatus), nil
 				}
 			}

pkg/library/home/persistentHome.go

@@ -22,6 +22,7 @@ import (
 	devfilevalidation "github.com/devfile/api/v2/pkg/validation"
 	"github.com/devfile/devworkspace-operator/pkg/provision/storage"
 	"k8s.io/utils/pointer"
+	corev1 "k8s.io/api/core/v1"
 
 	"github.com/devfile/devworkspace-operator/pkg/common"
 	"github.com/devfile/devworkspace-operator/pkg/constants"
@@ -227,3 +228,17 @@ func inferInitContainer(dwTemplateSpec *v1alpha2.DevWorkspaceTemplateSpec) *v1al
 	}
 	return nil
 }
+
+// EnsureHomeInitContainerFields ensures that an init-persistent-home container has
+// the correct Command and VolumeMounts.
+func EnsureHomeInitContainerFields(c *corev1.Container) error {
+	// Set default command only if not provided
+	if len(c.Command) == 0 {
+		c.Command = []string{"/bin/sh", "-c"}
+	}
+	c.VolumeMounts = []corev1.VolumeMount{{
+		Name:      constants.HomeVolumeName,
+		MountPath: constants.HomeUserDirectory,
+	}}
+	return nil
+}