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

l0rd · 2017-03-08T01:43:02Z

What does this PR do?

Add a new ServerEvaluationStrategy: SinglePortLocalDockerServerEvaluationStrategy.

This server strategy can be enabled adding che.docker.server_evaluation_strategy=single-port
in che.properties.

When the single-port strategy is enabled a workspace server address has the format server-ref.workspace-id.che-address like for example:

terminal.79rfwhqaztq2ru2k.che.local

To use the single-port strategy a reverse proxy should be used. This PR comes with the changes needed to use OpenShift embedded reverse-proxy too.

Changelog

Che server and workpaces exposed on the same single TCP port

codenvy-ci · 2017-03-08T01:44:01Z

Can one of the admins verify this patch?

benoitf · 2017-03-08T07:54:44Z

Why a new PR is opened. It looks like a duplicate of #4269

benoitf · 2017-03-08T07:55:50Z

ok it's because it's not for master there

garagatyi · 2017-03-09T07:59:34Z

@l0rd @amisevsk Note that links like terminal.79rfwhqaztq2ru2k.che.local can't serve workspace with multiple machines.

l0rd · 2017-03-09T09:07:29Z

@garagatyi that's a limitation we are aware of. And are ok with that for now (at least in openshift-connector branch).

l0rd · 2017-03-09T09:13:46Z

@garagatyi by the way thanks for your review and sorry for not answering before. We are integrating all our work in the openshift connector branch to have a particular use case working smoothly on OpenShift without privileges. Once we have that working we will address the rest of the issues and merge it on master.

garagatyi · 2017-03-09T09:26:23Z

ok, Mario

ibuziuk · 2017-03-09T13:16:53Z

@l0rd @amisevsk I have tried the following steps several times for verification:

rebase PR on openshift-connector branch
build che from root
build rhche/che-server:nightly image via rh-che build_openshift_connector.sh script
deploy it to minishift via latest 1.0.54 fabric8 online template with updated configmap:

che-server-evaluation-strategy: single-port
hostname-http: che-che.192.168.42.99.xip.io

When I try to open dashboard I see black screen just like on http://demo.che.ci.centos.org/dashboard/
with the same errors:
Failed to instantiate module userDashboard

Do you know why does it happen ?

ibuziuk · 2017-03-09T14:05:11Z

@l0rd having the same dashboard issue after building image from single-port-2 branch :/

ibuziuk · 2017-03-09T15:57:14Z

@l0rd after rebasing on top of master dashboard issue has disappeared, however I still can not create a workspace using single-port strategy. There are 6 routes created - https://snag.gy/ymu7gH.jpg but after that I have the following error:

failed to get the ID of the container running in the OpenShift pod
org.eclipse.che.api.core.ServerException: Failed to get the ID of the container running in the OpenShift pod

May it be coupled with my template config where I set hostname-http as
che-{project-name}.{minishift ip}.xip.io ?

l0rd · 2017-03-10T13:08:35Z

@ibuziuk @amisevsk I've fixed the errors I got and now this PR is ready to be tested/reviewed

ibuziuk · 2017-03-10T16:26:20Z

@l0rd I keep getting the following error on fresh minishift cluster:

Error when starting agent
Unable to start workspace agent. Error when trying to start the workspace agent: Start of environment 'default' failed. Error: Pod with deployment name che-ws-2zeig4fshd1cx24x not found

Here is the events view - https://snag.gy/DE6r4V.jpg
"Failed sync" warning might be the unexpected ^

che-host logs:


org.eclipse.che.api.core.ServerException: Pod with deployment name che-ws-2zeig4fshd1cx24x not found
	at org.eclipse.che.api.environment.server.CheEnvironmentEngine.startInstance(CheEnvironmentEngine.java:1004) ~[che-core-api-workspace-5.5.0-SNAPSHOT.jar:5.5.0-SNAPSHOT]
	at org.eclipse.che.api.environment.server.CheEnvironmentEngine.startEnvironmentQueue(CheEnvironmentEngine.java:810) ~[che-core-api-workspace-5.5.0-SNAPSHOT.jar:5.5.0-SNAPSHOT]
	at org.eclipse.che.api.environment.server.CheEnvironmentEngine.start(CheEnvironmentEngine.java:267) ~[che-core-api-workspace-5.5.0-SNAPSHOT.jar:5.5.0-SNAPSHOT]
	at org.eclipse.che.api.workspace.server.WorkspaceRuntimes.startEnvironmentAndPublishEvents(WorkspaceRuntimes.java:714) ~[che-core-api-workspace-5.5.0-SNAPSHOT.jar:5.5.0-SNAPSHOT]
	at org.eclipse.che.api.workspace.server.WorkspaceRuntimes.access$100(WorkspaceRuntimes.java:106) ~[che-core-api-workspace-5.5.0-SNAPSHOT.jar:5.5.0-SNAPSHOT]
	at org.eclipse.che.api.workspace.server.WorkspaceRuntimes$StartTask.call(WorkspaceRuntimes.java:979) [che-core-api-workspace-5.5.0-SNAPSHOT.jar:5.5.0-SNAPSHOT]
	at org.eclipse.che.api.workspace.server.WorkspaceRuntimes$StartTask.call(WorkspaceRuntimes.java:943) [che-core-api-workspace-5.5.0-SNAPSHOT.jar:5.5.0-SNAPSHOT]
	at org.eclipse.che.commons.lang.concurrent.CopyThreadLocalCallable.call(CopyThreadLocalCallable.java:30) ~[che-core-commons-lang-5.5.0-SNAPSHOT.jar:5.5.0-SNAPSHOT]
	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_121]
	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) ~[na:1.8.0_121]
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) ~[na:1.8.0_121]
	at java.lang.Thread.run(Thread.java:745) ~[na:1.8.0_121]
Caused by: org.eclipse.che.api.core.ServerException: Pod with deployment name che-ws-2zeig4fshd1cx24x not found
	at org.eclipse.che.plugin.docker.machine.MachineProviderImpl.startService(MachineProviderImpl.java:335) ~[che-plugin-docker-machine-5.5.0-SNAPSHOT.jar:5.5.0-SNAPSHOT]
	at org.eclipse.che.api.environment.server.CheEnvironmentEngine.lambda$startEnvironmentQueue$6(CheEnvironmentEngine.java:782) ~[che-core-api-workspace-5.5.0-SNAPSHOT.jar:5.5.0-SNAPSHOT]
	at org.eclipse.che.api.environment.server.CheEnvironmentEngine.startInstance(CheEnvironmentEngine.java:946) ~[che-core-api-workspace-5.5.0-SNAPSHOT.jar:5.5.0-SNAPSHOT]
	... 11 common frames omitted
Caused by: org.eclipse.che.plugin.openshift.client.exception.OpenShiftException: Pod with deployment name che-ws-2zeig4fshd1cx24x not found
	at org.eclipse.che.plugin.openshift.client.OpenShiftConnector.waitAndRetrieveContainerID(OpenShiftConnector.java:1310) ~[che-plugin-openshift-client-5.5.0-SNAPSHOT.jar:5.5.0-SNAPSHOT]
	at org.eclipse.che.plugin.openshift.client.OpenShiftConnector.createContainer(OpenShiftConnector.java:273) ~[che-plugin-openshift-client-5.5.0-SNAPSHOT.jar:5.5.0-SNAPSHOT]
	at org.eclipse.che.plugin.docker.machine.MachineProviderImpl.createContainer(MachineProviderImpl.java:544) ~[che-plugin-docker-machine-5.5.0-SNAPSHOT.jar:5.5.0-SNAPSHOT]
	at org.eclipse.che.plugin.docker.machine.MachineProviderImpl.startService(MachineProviderImpl.java:280) ~[che-plugin-docker-machine-5.5.0-SNAPSHOT.jar:5.5.0-SNAPSHOT]
	... 13 common frames omitted

l0rd · 2017-03-10T16:41:26Z

@ibuziuk if you get that is because I guess that the automatic 3-way merge automatically put back withPrivileged(true) here 😡

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

l0rd · 2017-03-10T16:49:59Z

@ibuziuk I've just rebased. You should not have this error now.

ibuziuk

\o/ was able to create workspace with "single-port" strategy. +1 apply

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

…-che#4351) Signed-off-by: Mario Loriedo <mloriedo@redhat.com>

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

…-che#4351) Signed-off-by: Mario Loriedo <mloriedo@redhat.com>

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

@fbenoit

* 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>

@fbenoit

* 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 (eclipse-che#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 '/' (eclipse-che#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 (eclipse-che#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 (eclipse-che#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>

l0rd requested a review from amisevsk March 8, 2017 01:43

l0rd mentioned this pull request Mar 8, 2017

Expose Che server and workspaces through one single TCP port #4269

Closed

l0rd force-pushed the openshift-connector branch from f4923c0 to 2580099 Compare March 9, 2017 14:16

l0rd requested a review from ibuziuk March 9, 2017 16:29

l0rd force-pushed the single-port-2 branch from b6c4936 to 4b8ab59 Compare March 10, 2017 12:23

l0rd mentioned this pull request Mar 10, 2017

New scripts for setting up the env redhat-developer/rh-che#21

Merged

l0rd added 2 commits March 10, 2017 17:43

Che server and workpaces exposed on the same single TCP port

ea0c4df

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

Explicitely set withPrivileged to false

aaa8d4c

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

l0rd force-pushed the single-port-2 branch from 930aed1 to aaa8d4c Compare March 10, 2017 16:47

ibuziuk approved these changes Mar 10, 2017

View reviewed changes

l0rd merged commit cda3edc into eclipse-che:openshift-connector Mar 10, 2017

l0rd added a commit that referenced this pull request Mar 13, 2017

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

2627489

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

JamesDrummond added this to the 5.5.0 milestone Mar 17, 2017

JamesDrummond mentioned this pull request Mar 17, 2017

5.5.0 Milestone Overview #4358

Closed

9 tasks

l0rd added a commit that referenced this pull request Mar 20, 2017

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

908a6e1

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

sunix pushed a commit to sunix/che that referenced this pull request May 4, 2017

Che server and workpaces exposed on the same single TCP port (eclipse…

5486b69

…-che#4351) Signed-off-by: Mario Loriedo <mloriedo@redhat.com>

sunix pushed a commit to sunix/che that referenced this pull request May 10, 2017

Che server and workpaces exposed on the same single TCP port (eclipse…

26d3060

…-che#4351) Signed-off-by: Mario Loriedo <mloriedo@redhat.com>

sunix pushed a commit that referenced this pull request May 11, 2017

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

55f05ea

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

sunix pushed a commit that referenced this pull request May 17, 2017

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

24065c0

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

sunix pushed a commit that referenced this pull request Jun 2, 2017

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

f45dbe8

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

sunix pushed a commit to sunix/che that referenced this pull request Jun 16, 2017

Che server and workpaces exposed on the same single TCP port (eclipse…

97b195f

…-che#4351) Signed-off-by: Mario Loriedo <mloriedo@redhat.com>

l0rd mentioned this pull request Jun 21, 2017

[WIP] Replace client side HTTP requests using the hostname that is in the address bar #2004

Closed

sunix pushed a commit that referenced this pull request Jun 29, 2017

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

787c854

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

l0rd commented Mar 8, 2017 •

edited by JamesDrummond

Loading

codenvy-ci commented Mar 8, 2017

benoitf commented Mar 8, 2017

benoitf commented Mar 8, 2017

garagatyi commented Mar 9, 2017

l0rd commented Mar 9, 2017

l0rd commented Mar 9, 2017

garagatyi commented Mar 9, 2017

ibuziuk commented Mar 9, 2017

ibuziuk commented Mar 9, 2017

ibuziuk commented Mar 9, 2017 •

edited

Loading

l0rd commented Mar 10, 2017

ibuziuk commented Mar 10, 2017

l0rd commented Mar 10, 2017

l0rd commented Mar 10, 2017

ibuziuk left a comment

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

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

Conversation

l0rd commented Mar 8, 2017 • edited by JamesDrummond Loading

What does this PR do?

Changelog

codenvy-ci commented Mar 8, 2017

benoitf commented Mar 8, 2017

benoitf commented Mar 8, 2017

garagatyi commented Mar 9, 2017

l0rd commented Mar 9, 2017

l0rd commented Mar 9, 2017

garagatyi commented Mar 9, 2017

ibuziuk commented Mar 9, 2017

ibuziuk commented Mar 9, 2017

ibuziuk commented Mar 9, 2017 • edited Loading

l0rd commented Mar 10, 2017

ibuziuk commented Mar 10, 2017

l0rd commented Mar 10, 2017

l0rd commented Mar 10, 2017

ibuziuk left a comment

Choose a reason for hiding this comment

l0rd commented Mar 8, 2017 •

edited by JamesDrummond

Loading

ibuziuk commented Mar 9, 2017 •

edited

Loading