Commit Graph

510 Commits (a1dfdfb04ef7f3369c8d313dbcd1992e22f3b244)

Author SHA1 Message Date
Artem Zatsarynnyi a1dfdfb04e Merge branch 'master' into spi 2017-07-05 18:25:50 +03:00
Korneta Anton 8e1fe4b65d Remove ssh-machine module and MachineLogMessage 2017-07-05 12:05:46 +03:00
Sun Seng David TAN 8049320348 Openshift connector improvements (#5052)
* CHE-4141 - Use Persistent Volumes Claims when creating workspaces

Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com>

* Implement getContainerLogs method in OpenShiftConnector

Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com>

* Implement createExec() and startExec() in OpenShiftConnector

Add implementations of createExec() and startExec(). Since OpenShift
does not separate the create and start steps, a holder class
KubernetesExecHolder is necessary, to pass information between
the call to createExec() (which just saves relevant information)
and startExec().

Additionally, adds KubernetesOutputAdapter, which parses the output
from OpenShift into LogMessages that can be handled by Che's
MessageProcessor<LogMessage> class.

Signed-off-by: Angel Misevski <amisevsk@redhat.com>

* Add implementation of getEvents() to avoid busy wait

Signed-off-by: Angel Misevski <amisevsk@redhat.com>

* Update Dockerfile to avoid permissions issues

Signed-off-by: Mario Loriedo <mloriedo@redhat.com>

* Che server and workpaces exposed on the same single TCP port (#4351)

Signed-off-by: Mario Loriedo <mloriedo@redhat.com>

* Disabling usage of user account service in openshift-connector

Signed-off-by: Sun Seng David Tan <sutan@redhat.com>

* Update Docker Compose tests to fix test failure

Updating to Jackson 2.7.7 causes tests in the docker compose
plugin to fail. This is due to the fact that the tests expect
empty values in dictionaries to be parsed as the empty string,
whereas jackson 2.7.7 parses them as null (as specified by the
yaml spec).

Modifies the affected tests to explicitly use an empty string
(i.e. "") instead of an empty value.

Signed-off-by: Angel Misevski <amisevsk@redhat.com>

* Find an alternative to subPath in volumeMount

Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com>

* Setting rwx permissions for all on /data/ in case it's not mounted

Signed-off-by: Mario Loriedo <mloriedo@redhat.com>

* Add support for resource limits when running on Openshift

Add resource limits to workspace Pods when running on OpenShift.
The memory limit is normally obtained from the API request to
create the workspace, however it can be overridden via the property
`che.openshift.workspace.memory.override`. The cpu limit used is
determined by the property `che.openshift.workspace.cpu.limit`.

In both cases, the value of the property is passed directly to
OpenShift, so any valid quantity is acceptable (e.g. 150Mi,
1Gi, 1024, etc).

Signed-off-by: Angel Misevski <amisevsk@redhat.com>

* Fix dockerImageConfig is null (since v1.5 of OpenShift API)

Signed-off-by: Sun Seng David Tan <sutan@redhat.com>

* Add Nullable annotation to che.docker.ip.external

The property che.docker.ip.external can be null, but
OpenShiftConnector does not include the annotation. This
prevents Che from initialising if e.g. running on docker
without the property set.

Signed-off-by: Angel Misevski <amisevsk@redhat.com>

* CHE-158 Adding TLS support for Workspace routes

Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>

* Adding property to set requests for RAM

Signed-off-by: Mario Loriedo <mloriedo@redhat.com>

* CHE-158 Using '-' instead of '.' for generating OpenShift route Urls

Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>

* Fixing tests after changing Url generation logic

Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>

* Redirect insecure HTTP requests to TLS endpoint

Signed-off-by: Mario Loriedo <mloriedo@redhat.com>

* CHE-180: Creating and closing OpenShiftClient in every method of OpenshiftConnector

Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>

* Update route naming to make it work on OSO

Signed-off-by: Mario Loriedo <mloriedo@redhat.com>

* Rework PVC management on OpenShift

- Change how subdirectories are created in pods to
  use a short, terminating job instead of a full deployment
- Add OpenShiftWorkspaceFilesCleaner class to properly
  notice workspace deleted events
- Add helper class to manage job pods. For creation, some
  effort is made to avoid attempting to create workspaces
  unnecessarily, but only exists in-memory
- Workspace deletions are batched together so that removing
  workspaces directories can be done when server is idled,
  avoiding unnecessary PVC mounts
- Add two new properties: che.openshift.jobs.image and
  che.openshift.jobs.memorylimit, which are used by
  OpenShiftPvcHelper to set up pods

Current issues:
- Since workspace directories are not deleted immediately,
  attempting to re-create a workspace with the same name
  will result in the previous instance's project to already
  be there. This should have a minor impact.
- Memory for which workspace dirs have been created is not
  persisted, resulting in potentially unnecessary jobs
- Openshift workspace files cleaner is included by overwriting
  binding in WsMasterModule instead of using a provider. This
  could be better, but OpenShift integration may be reaching a
  point where a custom module is a better solution.

Signed-off-by: Angel Misevski <amisevsk@redhat.com>
Signed-off-by: Sun Seng David Tan <sutan@redhat.com>

* Delete ReplicaSets explicitly when shutting down a workspace

Signed-off-by: Angel Misevski <amisevsk@redhat.com>

* Fix OpenShiftConnectorTest

Signed-off-by: Mario Loriedo <mloriedo@redhat.com>

* Fix route server names if unknown should start with server-.

https://issues.jboss.org/browse/CHE-230

Signed-off-by: Sun Seng David Tan <sutan@redhat.com>

* Add property to control manual workspace dir creation in OpenShift

Add property 'che.openshift.precreate.workspace.dirs'. If property is
true, OpenShiftConnector will run a pod before launching workspaces
to create a subpath in the workspace's persistent volume with correct
permissions. If the property is false, this step is skipped.

This is necessary as in older versions of OpenShift/Kubernetes, subpaths
created as part of a volume mount are created with root permissions, and
so cannot be modified by workspace pods. More recent versions fix this,
creating subpath volumes with correct permissions, making the step above
unnecessary.

Signed-off-by: Angel Misevski <amisevsk@redhat.com>

* CHE-102 - Idle detection of che-server and workspaces

Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com>

* Add and modify tests for OpenShift helper classes

Add tests for the untested classes in openshift.client.kuberentes,
and update existing tests where necessary.

Signed-off-by: Angel Misevski <amisevsk@redhat.com>

* Recent changes required access to `/` which is impossible under OS 

Signed-off-by: David Festal <dfestal@redhat.com>

* adapt che-server entrypoint.sh to environments without write permissions in '/' (#5344)

* adapt che-server entrypoint.sh to environments without write permissions in '/'

* CHE-280: Adding container's state info to the 'inspectContainer' API

Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>

* Factorize code of `ServerEvaluationStrategy` classes, to use the Custom strategy as the basis of other strategies (#5366)

* Pull-up the local docker port management (use exposed ports)

Signed-off-by: David Festal <dfestal@redhat.com>

* Make all the strategies extend `CustomEvaluationStrategy`

Signed-off-by: David Festal <dfestal@redhat.com>

* Add a `workspaceIdWithoutPrefix` macro and use it for `single-port`

This macro is based on the `workspaceId` macro, but without the
`workspace` prefix.

Signed-off-by: David Festal <dfestal@redhat.com>

* Add the `isDevMachine` to allow conditions in the ST template.

This is required to allow the `single-port` strategy to have a different
url according to the type of machine. (see the work done for CHE-175 :
Support multi-container workspaces on OpenShift)

Signed-off-by: David Festal <dfestal@redhat.com>

* Small fixes after comments from @fbenoit

Signed-off-by: David Festal <dfestal@redhat.com>

* Fix unnecessary space pointed out by @sunix

Signed-off-by: David Festal <dfestal@redhat.com>

* Remove unnecessary `else` as suggested by @sunix

Signed-off-by: David Festal <dfestal@redhat.com>

* Keep the method signatures compatible with the `condenvy` strategy

Signed-off-by: David Festal <dfestal@redhat.com>

* Align names of parameters of constructors (requested by @garagatyi)

Signed-off-by: David Festal <dfestal@redhat.com>

* Add a default implementation to avoid breaking the Codenvy build

Signed-off-by: David Festal <dfestal@redhat.com>

* Also rename the attributes

Signed-off-by: David Festal <dfestal@redhat.com>

* Use a constant for the `workspace` prefix string

Signed-off-by: David Festal <dfestal@redhat.com>

* Fix formatting as requested by @sunix

Signed-off-by: David Festal <dfestal@redhat.com>

* Use a constant for the `isDevMachine` macro name

Signed-off-by: David Festal <dfestal@redhat.com>

* Add unit tests for `workspaceIdWithoutPrefixè and `isDevMachine` macros

Signed-off-by: David Festal <dfestal@redhat.com>

* Another requested formatting fix

Signed-off-by: David Festal <dfestal@redhat.com>

* Make new tests clearer

Signed-off-by: David Festal <dfestal@redhat.com>

* yet another formatting request

Signed-off-by: David Festal <dfestal@redhat.com>

* Respect the original order of imports

Signed-off-by: David Festal <dfestal@redhat.com>

* remove unnecessary `toString()`

Signed-off-by: David Festal <dfestal@redhat.com>

* use a lowercase `S` in the `server-` prefix

Signed-off-by: David Festal <dfestal@redhat.com>

* Multi-container workspace Support (#5110)

* Fix 2 NPE that prevented using *non-dev* additional machines

In the context of https://issues.jboss.org/browse/CHE-175

Signed-off-by: David Festal <dfestal@redhat.com>

* Name openshift resources based on the machine name for non-dev machines

This fixes https://issues.jboss.org/browse/CHE-259
and https://issues.jboss.org/browse/CHE-258

Signed-off-by: David Festal <dfestal@redhat.com>

* Fix failing Traeffik tests...

... by:
- adding the new `CHE_IS_DEV_MACHINE` env variable in tests
- pulling up all the `CustomServerEvaluationStrategy` features in an
abstract `BaseServerEvaluationStrategy` (which all other Che strategies
extend) and have the `CustomServerEvaluationStrategy` class simply
extend this `BaseServerEvaluationStrategy`.

Signed-off-by: David Festal <dfestal@redhat.com>

* Fix tests in the LocalDockerEvaluationStrategy...

... by correctly using the boolean attribute to manage the new use-case
introduced by @fbenoit in master.

Signed-off-by: David Festal <dfestal@redhat.com>

* Replace OSIO-specific `single-port` strategy by `docker-local-custom` 

This fixes redhat-developer/rh-che#113

Signed-off-by: David Festal <dfestal@redhat.com>
2017-07-04 18:11:32 +02:00
Sergii Leshchenko 0504b313d8 CHE-5413 Rename Agent to Installer 2017-06-29 17:58:09 +03:00
Artem Zatsarynnyi 1ba5f63d8f Merge branch 'master' into spi 2017-06-29 17:45:59 +03:00
Roman Iuvshin eab04ddd6b RELEASE: Set next development version 2017-06-29 07:59:05 +00:00
Sergii Leshchenko fa48da7d74 CHE-4101 Rework docker infrastructure to use bootstrapper to start installers 2017-06-23 15:23:41 +03:00
Artem Zatsarynnyi ad2460999e Merge branch 'master' into spi 2017-06-22 08:27:59 +03:00
Michail Kuznetsov 10227bf474 Set correct scopes for dependencies (#5416) 2017-06-21 14:22:15 +00:00
Roman Iuvshin 513aa19ebd RELEASE: Set next development version 2017-06-21 13:04:16 +00:00
Artem Zatsarynnyi 812338b6b5 Merge branch 'master' into spi 2017-06-20 13:57:48 +03:00
Vladyslav Zhukovskii b95d74c5bb Broadcast project import output through json rpc protocol (#4888)
* Broadcast project import output through json rpc protocol

Signed-off-by: Vladyslav Zhukovskii <vzhukovskii@codenvy.com>

* Remove redundant text

Signed-off-by: Vladyslav Zhukovskii <vzhukovskii@codenvy.com>

* Code refactoring

* Code refactoring

* Name convention

* New line

* Refactor method body

* Add log call

* Extract hardcoded strings to the constants
2017-06-20 12:22:53 +03:00
Anton Korneta c34d359921 Change public stacks, recipes loading policy (#5234) 2017-06-20 11:31:00 +03:00
Alexander Garagatyi 0993fb8a2b CHE-5093: hard code server status check in docker infra (#5405)
Add hard coded server status check in Docker infrastructure to
test usage of server statuses events in client load sequence.
Add server URL into ServerStatueEvent to ease workflow of the client.
Add more info about agent into the internal representation of agent.
Use assisted injection to clean up docker infra code.
Allow accessing Docker machine before agents start to prevent
crashes of wsagent.
2017-06-20 11:19:43 +03:00
Artem Zatsarynnyi cce79bf469 Merge branch 'master' into spi
# Conflicts:
#	assembly/assembly-wsmaster-war/pom.xml
#	infrastructures/docker/pom.xml
#	plugins/plugin-docker/che-plugin-docker-compose/pom.xml
#	plugins/plugin-github/che-plugin-github-pullrequest/src/main/java/org/eclipse/che/plugin/pullrequest/client/GitHubHostingService.java
#	plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunAllTestAction.java
#	plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunClassTestAction.java
#	plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunAllTestAction.java
#	plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunClassTestAction.java
#	plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunTestXMLAction.java
#	pom.xml
#	wsmaster/che-core-api-machine/pom.xml
2017-06-15 10:35:47 +03:00
Roman Iuvshin eb2fa0eeed RELEASE: Set next development version 2017-06-14 07:13:04 +00:00
Dmitry Kuleshov 0fc83c5df9 Fixed freezing of IDE in case of LS initialization timeout or failure (#5341) 2017-06-13 17:45:24 +03:00
Max Shaposhnik 89896f6c7f Handling bootstrapper & installer events. (#5345) 2017-06-13 11:42:20 +00:00
Gennady Azarenkov 04ecd21e1d recommended Runtime/Context refactoring 2017-06-03 14:54:05 +03:00
Max Shaposhnik 3d93a98c59 Move snapshot interface into docker infra 2017-05-30 18:35:42 +03:00
Dmitry Kuleshov 762da09374 fixed collections api usage typo
Signed-off-by: Dmitry Kuleshov <dkuleshov@codenvy.com>
2017-05-30 11:50:48 +03:00
Dmitry Kuleshov 9d033293ff fixed npe in subscription manager
Signed-off-by: Dmitry Kuleshov <dkuleshov@codenvy.com>
2017-05-30 11:30:23 +03:00
Dmitry Kuleshov 1379fbf602 added subscription manager (#5226) 2017-05-30 11:22:06 +03:00
Max Shaposhnik 8afc4eb053 Restore snapshots functionality; 2017-05-29 11:00:59 +00:00
Artem Zatsarynnyi fa91db1f4e Merge branch 'master' into spi 2017-05-29 11:25:30 +03:00
Gennady Azarenkov 69b34831c6 SPI messaging and code clean 2017-05-25 21:14:45 +03:00
Gennady Azarenkov 8ad21b4638 SPI messaging and code clean 2017-05-25 21:12:12 +03:00
Dmitry Kuleshov cc8fd2473a Switch TestDocument (LSP) service to the websocket JSON-RPC (#5186) 2017-05-25 16:44:42 +03:00
Artem Zatsarynnyi 993e8df52e Merge branch 'master' into spi 2017-05-24 12:16:17 +03:00
Roman Iuvshin 9fbf173eb9 RELEASE: Set next development version 2017-05-24 07:30:41 +00:00
Artem Zatsarynnyi 69b1d1583c Merge branch 'master' into spi 2017-05-23 10:07:00 +03:00
Vitalii Parfonov 140975f443 Set debug level for some messages (#5155)
Signed-off-by: Vitalii Parfonov <vparfonov@codenvy.com>
2017-05-22 16:45:04 +03:00
Gennady Azarenkov b38f73da76 remove ServerProperties 2017-05-21 18:28:45 +03:00
Alexander Garagatyi da9e3c819b CHE-5095: cleanup Docker infra impl
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
2017-05-17 17:52:30 +03:00
Artem Zatsarynnyi e914a59c3e Merge branch 'master' into spi 2017-05-17 11:03:00 +03:00
Gennady Azarenkov 45a0ece9b4 remove old entities 2017-05-16 20:13:57 +03:00
Dmitry Kuleshov 3deb16ea97 Unification of JSON RPC codebase (#5005) 2017-05-16 15:03:24 +03:00
Alexander Garagatyi 21c4589086 Merge branch 'master' into spi
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
2017-05-15 12:27:23 +03:00
Gennady Azarenkov 2e8ec36097 ServerStatus 2017-05-13 22:53:25 +03:00
Roman Iuvshin b3ae33acf5 RELEASE: Set next development version 2017-05-10 10:54:42 +00:00
Alexander Garagatyi 7877e47f6a Merge branch 'master' into spi
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
2017-04-27 12:08:59 +03:00
Gennady Azarenkov de7fbc9c3c Fix javadocs 2017-04-25 21:42:39 +03:00
Roman Iuvshin 6d88cf8c73 [maven-release-plugin] prepare for next development iteration 2017-04-25 18:19:17 +00:00
Roman Iuvshin d7f023fd89 [maven-release-plugin] prepare release 5.9.0 2017-04-25 18:19:10 +00:00
Alexander Garagatyi bac363f5ff Merge branch 'master' into spi
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
2017-04-20 11:21:10 +03:00
Vitalii Parfonov 237cb09a31 Revert "Fixes cases where we send primitive values over Json RPC (#4751)" (#4854)
This reverts commit a3d2516685.
2017-04-20 11:13:21 +03:00
Dmitry Kuleshov a3d2516685 Fixes cases where we send primitive values over Json RPC (#4751)
Signed-off-by: Dmitry Kuleshov <dkuleshov@codenvy.com>
2017-04-19 17:40:13 +03:00
Sergii Kabashniuk b016d619cb 3656 Port Languages Server Support to lsp4j (#4765)
* Initial import from https://github.com/eclipse/che/pull/4160

* Added formatting for changed files

* Organize imports

* Added missing logback and removed unused dependency

* Fix plugin-languageserver compilation issue

* Move lsp4j dependency to lsp plugin
2017-04-19 17:33:59 +03:00
Alexander Garagatyi 7e0ed03cf2 Merge branch 'master' into spi 2017-04-19 16:52:48 +03:00
Gennady Azarenkov 493e07ca95 Move NewProjectConfig from model to project-shared 2017-04-19 09:15:51 +03:00