From d2aff8c8d8bc9fd57f02e5d7e259468037286f99 Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Wed, 2 Oct 2019 16:18:50 +0200 Subject: [PATCH 1/3] Removed overriding of CHE_LIMITS_WORKSPACE_IDLE_TIMEOUT --- pkg/deploy/che_configmap.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/deploy/che_configmap.go b/pkg/deploy/che_configmap.go index b6b2f0c032..f31f0fd627 100644 --- a/pkg/deploy/che_configmap.go +++ b/pkg/deploy/che_configmap.go @@ -73,7 +73,6 @@ func GetCustomConfigMapData() (cheEnv map[string]string) { "CHE_INFRA_KUBERNETES_SERVICE__ACCOUNT__NAME": "che-workspace", "CHE_WORKSPACE_AUTO_START": "true", "CHE_INFRA_KUBERNETES_WORKSPACE__UNRECOVERABLE__EVENTS": "FailedMount,FailedScheduling,MountVolume.SetUp failed,Failed to pull image", - "CHE_LIMITS_WORKSPACE_IDLE_TIMEOUT": "-1", } return cheEnv From b1c9158912753716880d1f30ef298cfaae04666d Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Fri, 4 Oct 2019 08:54:07 +0200 Subject: [PATCH 2/3] Sync workspace idle timeout with upstream 1800000 --- pkg/deploy/che_configmap.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/deploy/che_configmap.go b/pkg/deploy/che_configmap.go index f31f0fd627..628283615f 100644 --- a/pkg/deploy/che_configmap.go +++ b/pkg/deploy/che_configmap.go @@ -73,6 +73,7 @@ func GetCustomConfigMapData() (cheEnv map[string]string) { "CHE_INFRA_KUBERNETES_SERVICE__ACCOUNT__NAME": "che-workspace", "CHE_WORKSPACE_AUTO_START": "true", "CHE_INFRA_KUBERNETES_WORKSPACE__UNRECOVERABLE__EVENTS": "FailedMount,FailedScheduling,MountVolume.SetUp failed,Failed to pull image", + "CHE_LIMITS_WORKSPACE_IDLE_TIMEOUT": "1800000", } return cheEnv From 7bc118e303d88e23d273c124dd6e23141e7816c8 Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Fri, 4 Oct 2019 10:36:16 +0200 Subject: [PATCH 3/3] Removed default properties, they has to come from upstream --- pkg/deploy/che_configmap.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkg/deploy/che_configmap.go b/pkg/deploy/che_configmap.go index 628283615f..f240a2fda5 100644 --- a/pkg/deploy/che_configmap.go +++ b/pkg/deploy/che_configmap.go @@ -69,11 +69,7 @@ type CheConfigMap struct { func GetCustomConfigMapData() (cheEnv map[string]string) { cheEnv = map[string]string{ - "CHE_PREDEFINED_STACKS_RELOAD__ON__START": "true", "CHE_INFRA_KUBERNETES_SERVICE__ACCOUNT__NAME": "che-workspace", - "CHE_WORKSPACE_AUTO_START": "true", - "CHE_INFRA_KUBERNETES_WORKSPACE__UNRECOVERABLE__EVENTS": "FailedMount,FailedScheduling,MountVolume.SetUp failed,Failed to pull image", - "CHE_LIMITS_WORKSPACE_IDLE_TIMEOUT": "1800000", } return cheEnv