UNF: use new merge function to get external DWOC

Author: AObuchow

apis/controller/v1alpha1/devworkspaceoperatorconfig_types.go

@@ -79,7 +79,7 @@ type StorageSizes struct {
 	PerWorkspace *resource.Quantity `json:"perWorkspace,omitempty"`
 }
 
-//TODO: Should this be here or in another file?
+//TODO: Remove this
 // Allows specifying an external DevWorkspace-Operator configuration
 // which will merged with the workspace's DevWorkspace-Operator configuration.
 type ExternalConfig struct {

controllers/workspace/devworkspace_controller.go

@@ -110,7 +110,6 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
 
 	// Fetch the Workspace instance
 	workspaceWithConfig := &common.DevWorkspaceWithConfig{}
-	workspaceWithConfig.Config = *config.InternalConfig
 	err = r.Get(ctx, req.NamespacedName, &workspaceWithConfig.DevWorkspace)
 	if err != nil {
 		if k8sErrors.IsNotFound(err) {
@@ -122,6 +121,10 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		// Error reading the object - requeue the request.
 		return reconcile.Result{}, err
 	}
+
+	// Get the config for the workspace
+	workspaceWithConfig.Config = *config.InternalConfig
+
 	reqLogger = reqLogger.WithValues(constants.DevWorkspaceIDLoggerKey, workspaceWithConfig.Status.DevWorkspaceId)
 	reqLogger.Info("Reconciling Workspace")