From 2add87ded1fdda6438247a4e576fa19e3e89b208 Mon Sep 17 00:00:00 2001 From: Vitalii Parfonov Date: Thu, 15 Aug 2019 15:31:59 +0300 Subject: [PATCH 1/3] Revert "Use next version for default plugins (#14247)" This reverts commit d9b01bc01d40ee9e562ce2fcbfac080062fc57b8. --- .../src/main/webapp/WEB-INF/classes/che/che.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties index f40706ad3bd..0f5b84cfe49 100644 --- a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties +++ b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties @@ -648,7 +648,7 @@ che.wsagent.cors.enabled=true ## Factory defaults. # Editor and plugin which will be used for factories which are created from remote git repository # which doesn't contain any Che-specific workspace descriptors (like .devfile of .factory.json) -che.factory.default_editor=eclipse/che-theia/next +che.factory.default_editor=eclipse/che-theia/7.0.0-next # multiple plugins must be comma-separated, for example: # pluginFooPublisher/pluginFooName/pluginFooVersion,pluginBarPublisher/pluginBarName/pluginBarVersion che.factory.default_plugins=eclipse/che-machine-exec-plugin/next @@ -660,7 +660,7 @@ che.factory.default_plugins=eclipse/che-machine-exec-plugin/next # Default Editor that should be provisioned into Devfile if there is no specified Editor # Format is `editorPublisher/editorName/editorVersion` value. # `NULL` or absence of value means that default editor should not be provisioned. -che.workspace.devfile.default_editor=eclipse/che-theia/next +che.workspace.devfile.default_editor=eclipse/che-theia/7.0.0-next # Default Plugins which should be provisioned for Default Editor. # All the plugins from this list that are not explicitly mentioned in the user-defined devfile From 3214f3404d9dab66f6363a7d2ef1aaa3abf1c1ba Mon Sep 17 00:00:00 2001 From: Vitalii Parfonov Date: Thu, 15 Aug 2019 15:34:39 +0300 Subject: [PATCH 2/3] Use taged version for plugins Signed-off-by: Vitalii Parfonov --- .../src/main/webapp/WEB-INF/classes/che/che.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties index 0f5b84cfe49..4d11083e8b4 100644 --- a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties +++ b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties @@ -648,7 +648,7 @@ che.wsagent.cors.enabled=true ## Factory defaults. # Editor and plugin which will be used for factories which are created from remote git repository # which doesn't contain any Che-specific workspace descriptors (like .devfile of .factory.json) -che.factory.default_editor=eclipse/che-theia/7.0.0-next +che.factory.default_editor=eclipse/che-theia/7.0.0 # multiple plugins must be comma-separated, for example: # pluginFooPublisher/pluginFooName/pluginFooVersion,pluginBarPublisher/pluginBarName/pluginBarVersion che.factory.default_plugins=eclipse/che-machine-exec-plugin/next @@ -660,7 +660,7 @@ che.factory.default_plugins=eclipse/che-machine-exec-plugin/next # Default Editor that should be provisioned into Devfile if there is no specified Editor # Format is `editorPublisher/editorName/editorVersion` value. # `NULL` or absence of value means that default editor should not be provisioned. -che.workspace.devfile.default_editor=eclipse/che-theia/7.0.0-next +che.workspace.devfile.default_editor=eclipse/che-theia/7.0.0 # Default Plugins which should be provisioned for Default Editor. # All the plugins from this list that are not explicitly mentioned in the user-defined devfile From 33d02699af9a4ab85069ffee2a770852c7fe934d Mon Sep 17 00:00:00 2001 From: Vitalii Parfonov Date: Thu, 15 Aug 2019 16:52:41 +0300 Subject: [PATCH 3/3] set 7.0.0 version for plugin registry Signed-off-by: Vitalii Parfonov --- .../helm/che/custom-charts/che-plugin-registry/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/values.yaml b/deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/values.yaml index 8c3b6acbdd8..90eef4f2652 100644 --- a/deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/values.yaml +++ b/deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/values.yaml @@ -8,7 +8,7 @@ # chePluginRegistry: - image: quay.io/eclipse/che-plugin-registry:nightly + image: quay.io/eclipse/che-plugin-registry:7.0.0 imagePullPolicy: Always memoryLimit: 256Mi memoryRequests: 16Mi