Commit Graph

22 Commits (a1dfdfb04ef7f3369c8d313dbcd1992e22f3b244)

Author SHA1 Message Date
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
Eugene Ivantsov 832509c5a4 Fix entrypoint to respect CHE_DOCKER_IP (#5507)
* Fix entrypoint to respect CHE_DOCKER_IP

Signed-off-by: Eugene Ivantsov <eivantsov@codenvy.com>

* Fix entrypoint to respect CHE_DOCKER_IP

Signed-off-by: Eugene Ivantsov <eivantsov@codenvy.com>

* Fix entrypoint to respect CHE_DOCKER_IP

Signed-off-by: Eugene Ivantsov <eivantsov@codenvy.com>

* Fix entrypoint to respect CHE_DOCKER_IP

Signed-off-by: Eugene Ivantsov <eivantsov@codenvy.com>
2017-06-30 11:56:01 +03:00
Roman Iuvshyn 4f52716a98 add notification file (#5441) 2017-06-26 18:05:45 +03:00
Anton Korneta c34d359921 Change public stacks, recipes loading policy (#5234) 2017-06-20 11:31:00 +03:00
David Windell dbfb74c232 Fix workspace storage path on Docker Cloud (#4931)
Signed-off-by: David Windell <david@outeredgeuk.com>
2017-05-26 22:56:19 +03:00
Roman Iuvshin d75545d200 fix che-server entrypoint for non CLI usage 2017-05-26 22:04:14 +03:00
Roman Iuvshin 0e17aff750 copy embedded che.properties to CHE_LOCAL_CONF_DIR if no custom config provided (#5202) 2017-05-25 18:05:06 +03:00
Roman Iuvshin 4813a1a712 fix CHE custom properties usage (#5103) 2017-05-17 10:33:33 +03:00
Alexander Garagatyi 798ca081b4 CHE-4098: separate terminal and exec agents (#4486)
Refactor golang terminal code.
Add ping frames into terminal websocket connection.
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
2017-03-27 12:27:27 +03:00
Tyler Jewell 2d3e371c45 Customize image names during image build (#4336)
The build scripts have been modified to generate images of the format $ORGANIZATION/$PREFIX-$NAME:$TAG. The default organization is eclipse, the default tag is nightly, and the default prefix is che. You can proivde --organization:<org>, --prefix:<prefix>, or --tag:<tag> on the command line to customize the images that are generated.

There is a new build-che.sh script which builds the minimum set of images to generate a new Che server, the CLI, and unit tests for these custom image names. If you build the CLI image, we overwrite /dockerfiles/cli/version/$TAG/images file to include the customized names that have been provided before this image is built, so the registry within the Docker image is accurate.

Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
2017-03-10 13:41:45 +01:00
Tyler Jewell b53932db99 CLI - set uid:gid of Che and workspaces (#4050)
Signed-off-by: Tyler Jewell <tjewell@codenvy.com>
* Update docker-compose.yml.erb
* Add uid checks
2017-02-20 07:33:57 -08:00
Roman Iuvshin ed06339358 use official openjdk image (#4087)
* use official openjdk image
2017-02-10 14:34:35 +02:00
Mario Loriedo 0e249109d2 Fix locale on CentoOS based image
Signed-off-by: Mario Loriedo <mloriedo@redhat.com>
2017-02-08 23:14:00 +01:00
Florent BENOIT 5554345aae [cli] Fix cli tests by reworking how integration tests are launched (#3991)
* Fix #3980 by reworking how integration tests are launched
- We used OS path mounted into container path (it makes issues as on Windows we don’t have these paths)
- Now use /dockerfiles path inside the container
- add skip check for nightlies or it was downloading new images while testing the current nightly
- add —rm for cleaning containers at the end of docker run
- introduce of some asserts instead of custom checks
- Fix windows issue (like path with spaces)
- Fix teardown of che start tests

Change-Id: I352d7c475796df641c1e34f461c55a76c897922d
Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
2017-02-02 09:43:48 +01:00
Florent BENOIT 02f91a300f fix #3913 : che-server should reuse property of CHE_LOGS_DIR if externally defined
Change-Id: I73b8beed66b63f5368edb7b607fbdd96cbf69d93
Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
2017-01-27 15:38:18 +01:00
Alexander Garagatyi 6b46f73c2c CHE-3686: fix docker machines addresses setting
Set internal machine address by CLI from CHE_IP.
Add and fix docs in che.env.
Change behavior of default machine server address evaluation
to be similar to the previous state.
Code cleanup.
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
2017-01-20 18:10:32 +02:00
Florent BENOIT dbdb0bc047 Fix #3686 : Property around external docker has been changed in a refactoring but it has not been updated everywhere (#3753)
Change-Id: I6da2c6f33cc063dda08b953eb2fab16abe4a0c86
Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
2017-01-17 02:49:46 -07:00
Mario Loriedo 39416e19a0 Minor dockerfiles build fixes
Signed-off-by: Mario Loriedo <mloriedo@redhat.com>
2017-01-04 10:13:51 +01:00
Mario Loriedo 73685c1f82 Move centos containers pipeline file do dockerfiles folder
Signed-off-by: Mario Loriedo <mloriedo@redhat.com>
2016-12-23 17:33:16 +01:00
Florent BENOIT 940b0bc7bd [dockerfiles] Fix scripts to be compliant with sh (and not only bash) (#3397) 2016-12-15 03:21:12 -07:00
Snjezana Peco 394ca3b512 CHE-3264 - Starting the che server as an user
Signed-off-by: Snjezana Peco <snjezana.peco@redhat.com>
2016-12-12 19:21:41 +01:00
Florent BENOIT a7d4bb753e CHE-2977 "move the core Che Dockerfiles and Dockerfile.centos into /dockerfiles/che (#3318)
* CHE-2977 "move the core Che Dockerfiles and Dockerfile.centos into /dockerfiles/che"

merge docker.sh and che.sh.
also docker.sh script is moved from the assembly folder to the docker image folder and named entrypoint.sh

Change-Id: I7404f8f2896e8a7eea83ecab57a6c4c623c68abe
Signed-off-by: Florent BENOIT <fbenoit@codenvy.com>
2016-12-12 09:09:24 -07:00