Commit Graph

415 Commits (a2f7d40d2f4e0af4f3a4e9e1be65f7aa1675e3de)

Author SHA1 Message Date
Sergii Leshchenko 1fa5248648 Merge pull request #5716 from eclipse/spi-openshift
OpenShift spi initial implementation
2017-07-20 16:58:02 +03:00
Sergii Leshchenko a0a51f6d77 OpenShift initial implementation 2017-07-20 16:54:21 +03:00
Sergii Leshchenko 8480c21002 Fix construction of output channel 2017-07-20 15:34:24 +03:00
Sergii Leshchenko c806b8011b Move installer and output endpoints to api-workspace module 2017-07-20 15:34:24 +03:00
Sergii Leshchenko c9b689d22e Fix location of agent binaries 2017-07-20 15:34:23 +03:00
Artem Zatsarynnyi b851196df5 Merge branch 'master' into spi 2017-07-20 12:30:15 +03:00
Valeriy Svydenko 6c6e00e2bd Adapt JUnit4 runner according new API (#5710) 2017-07-20 09:49:34 +03:00
Roman Iuvshyn 185273f8b9 RELEASE: Set next development version (#5734)
* RELEASE: Set next development version
2017-07-19 12:45:32 +03:00
Artem Zatsarynnyi 21e216441b Enable Composer plugin 2017-07-17 08:25:39 +03:00
Artem Zatsarynnyi 51cd595497 Merge branch 'master' into spi 2017-07-14 16:03:43 +03:00
Kaloyan Raev e1868db831 Rework Composer plugin to avoid using Everrest based Websocket calls (#5629)
* Rework Composer plugin to avoid using Everrest based Websocket calls

Fixes #5348

Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com>

* Fix dependencies

Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
2017-07-13 22:06:24 +03:00
Korneta Anton 80c788d42b Move MachineSource into docker infrastructure 2017-07-13 17:50:15 +03:00
Artem Zatsarynnyi c49aeb0977 Merge branch 'master' into spi 2017-07-13 10:24:36 +03:00
Michail Kuznetsov 0be04a656e CHE-274 - Improve idling implementation (#5512)
* CHE-274 - Improve idling implementation

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

* CHE-274 - Improve idling implementation

* fixup! CHE-274 - Improve idling implementation

* fixup! fixup! CHE-274 - Improve idling implementation

* fixup! fixup! fixup! CHE-274 - Improve idling implementation

* fixup! fixup! fixup! fixup! CHE-274 - Improve idling implementation

* fixup! fixup! fixup! fixup! fixup! CHE-274 - Improve idling implementation

* fixup! fixup! fixup! fixup! fixup! fixup! CHE-274 - Improve idling implementation

* fixup! fixup! fixup! fixup! fixup! fixup! fixup! CHE-274 - Improve idling implementation

* fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! CHE-274 - Improve idling implementation

* fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! CHE-274 - Improve idling implementation

* fixup
2017-07-12 18:35:04 +03:00
Artem Zatsarynnyi fa29ac0f6e Removes EverREST over WebSocket feature from IDE (#5622) 2017-07-12 16:39:25 +03:00
Artem Zatsarynnyi da2b92c66e Merge branch 'master' into spi 2017-07-12 11:37:57 +03:00
Korneta Anton 1519136caa Remove traefik from build 2017-07-07 14:10:55 +03:00
Valeriy Svydenko a5b3b7b612 New runner for TestNG tests (#5472) 2017-07-06 16:20:58 +03:00
Korneta Anton 59aa09ac6b Remove plugin docker machine 2017-07-06 15:23:34 +03:00
Artem Zatsarynnyi a1dfdfb04e Merge branch 'master' into spi 2017-07-05 18:25:50 +03:00
Vitalii Parfonov c22466c269 Move binding ServerIdleDetctor to the assembly module (#5541)
Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
2017-07-05 18:24:14 +03:00
Korneta Anton 566a3df0a3 Remove all related to MachineStateListener 2017-07-05 12:05:46 +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
Oleksandr Garagatyi 72ed75be0c Code cleanup 2017-07-04 16:21:39 +03:00
Anton Korneta 8b4eaaf5fc Add infrastructure output endpoint for messages/logs (#5466) 2017-07-04 13:35:03 +03:00
Artem Zatsarynnyi 7b0fd18f05 Merge branch 'master' into spi 2017-07-03 10:15:20 +03:00
Florent BENOIT bd327ac4fa Remove deprecated single descriptor and move to multi descriptors which is the replacement (#5490)
* Remove deprecated single descriptor and move to multi descriptors which is not deprecated
It will allow to upgrade maven assembly descriptor

Change-Id: I11fb19428ce484457074fa7c8a7b4ad7a5c5653f
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-07-03 08:09:07 +02:00
Sergii Leshchenko 9d7a2d998c CHE-5413 Refactor Installer API 2017-06-29 17:58:09 +03:00
Sergii Leshchenko 0504b313d8 CHE-5413 Rename Agent to Installer 2017-06-29 17:58:09 +03:00
Sergii Leshchenko 8a0654040f CHE-5413 Remove agents launchers 2017-06-29 17:57:00 +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
Artem Zatsarynnyi a9d7011fdb Merge branch 'master' into spi 2017-06-28 11:14:17 +03:00
Vitalii Parfonov 6f0b74ed25 Merge Bartlomiej Laczkowski PhpUnit testing PR (#5468)
* Initial support for PHPUnit testing.

Signed-off-by: Bartlomiej Laczkowski <bartlomiej.l@zend.com>

* Added improvements for exceptions handling and presentation model.

Signed-off-by: Bartlomiej Laczkowski <bartlomiej.l@zend.com>

* Improved test results presentation model and tests execution rules.

Signed-off-by: Bartlomiej Laczkowski <bartlomiej.l@zend.com>

* Small fixup after merge with master.

Signed-off-by: Bartlomiej Laczkowski <bartlomiej.l@zend.com>

* Added combined printer file that conforms different PHPUnit versions.

Signed-off-by: Bartlomiej Laczkowski <bartlomiej.l@zend.com>

* Fixed possible NPE issue while opening PHPUnit test case source file.

Signed-off-by: Bartlomiej Laczkowski <bartlomiej.l@zend.com>

* Bump up PHPUnit plug-ins version to 5.12.0.

* Small fixup after merge with master.

Signed-off-by: Bartlomiej Laczkowski <bartlomiej.l@zend.com>

* Format code to be in line with Che code conventions.

Signed-off-by: Bartlomiej Laczkowski <bartlomiej.l@zend.com>

* Small fix, add debugId

Signed-off-by: Vitalii Parfonov <vparfonov@codenvy.com>
2017-06-26 17:56:19 +03:00
Artem Zatsarynnyi 183534f3bb Include all IDE plugins to GWT build 2017-06-26 17:22:24 +03: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
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
Anton Korneta c34d359921 Change public stacks, recipes loading policy (#5234) 2017-06-20 11:31:00 +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
Igor Vinokur c5e7a3464b CHE-5169: Add Git credentials agent (#5285)
Git credentials agent fetches SSH keys and Git username and email from CHE user preferences, and injects to console Git preferences
2017-06-14 16:43:09 +03:00
Roman Iuvshin eb2fa0eeed RELEASE: Set next development version 2017-06-14 07:13:04 +00:00
Artem Zatsarynnyi 1d5648fd6e Fix building project with maven (#5354) 2017-06-12 23:48:28 +03:00
Gennady Azarenkov c66c9dd48f Ide workaround 2017-05-30 20:28:11 +03:00
Artem Zatsarynnyi fa91db1f4e Merge branch 'master' into spi 2017-05-29 11:25:30 +03:00
Vitalii Parfonov 7126c71306 Add gwt-logger dependency to the core-ide (#5216)
Signed-off-by: Vitalii Parfonov <vparfonov@codenvy.com>
2017-05-26 17:56:10 +03:00
Gennady Azarenkov 8ad21b4638 SPI messaging and code clean 2017-05-25 21:12:12 +03:00
Artem Zatsarynnyi 993e8df52e Merge branch 'master' into spi 2017-05-24 12:16:17 +03:00