feat: configure DWO progressTimeout through Che Cluster CR

Fix eclipse-che/che#21820 Signed-off-by: Andrew Obuchowicz <[email protected]>
AObuchow · Dec 7, 2022 · 1348347 · 1348347
1 parent aa314bf
commit 1348347
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/pkg/deploy/dev-workspace-config/dev_workspace_config.go b/pkg/deploy/dev-workspace-config/dev_workspace_config.go
@@ -93,10 +93,15 @@ func updateOperatorConfig(cheCluster *chev2.CheCluster, operatorConfig *controll
 		operatorConfig.Workspace = &controllerv1alpha1.WorkspaceConfig{}
 	}
 
-	return updateWorkspaceConfig(pvc, pvcStrategy == constants.PerWorkspacePVCStorageStrategy, cheCluster.IsContainerBuildCapabilitiesEnabled(), cheCluster.Spec.DevEnvironments.PodSchedulerName, operatorConfig.Workspace)
+	return updateWorkspaceConfig(pvc,
+		pvcStrategy == constants.PerWorkspacePVCStorageStrategy,
+		cheCluster.IsContainerBuildCapabilitiesEnabled(),
+		cheCluster.Spec.DevEnvironments.PodSchedulerName,
+		cheCluster.Spec.DevEnvironments.StartTimeout,
+		operatorConfig.Workspace)
 }
 
-func updateWorkspaceConfig(pvc *chev2.PVC, isPerWorkspacePVCStorageStrategy bool, enabledContainerBuildCapabilities bool, podSchedulerName string, workspaceConfig *controllerv1alpha1.WorkspaceConfig) error {
+func updateWorkspaceConfig(pvc *chev2.PVC, isPerWorkspacePVCStorageStrategy bool, enabledContainerBuildCapabilities bool, podSchedulerName string, startTimeout string, workspaceConfig *controllerv1alpha1.WorkspaceConfig) error {
 	if pvc != nil {
 		if pvc.StorageClass != "" {
 			workspaceConfig.StorageClassName = &pvc.StorageClass
@@ -126,6 +131,7 @@ func updateWorkspaceConfig(pvc *chev2.PVC, isPerWorkspacePVCStorageStrategy bool
 	}
 
 	workspaceConfig.SchedulerName = podSchedulerName
+	workspaceConfig.ProgressTimeout = startTimeout
 
 	return nil
 }