Generalize the ingress configuration to support single-host in single-user mode on kubernetes #14134

metlos · 2019-08-05T19:50:24Z

What does this PR do?

This adds support for better control over the ingress path for workspaces running using single-host server strategy on k8s.

This PR tries to address the following scenarios:

support running single-host with nginx ingress controller < 0.22.0 (present in minikube 0.35.0 and down)
support running with nginx ingress controller > 0.22.0 (present in minikube 1.0.0 and up) - currently partially works (UI starts to load but never finishes - the <WORKSPACE_ENDPOINT>/services websocket never replies with any response to the requests the UI side is sending)
~~support single-host server strategy in the multi-user server (this most probably also involves fixing JWT proxy doesn't preserve request path when redirects to WS master for authentication #12988)~~ This is now tracked in its own issue - Support single-host/default-host in multi-user server mode #14189

What issues does this PR fix or reference?

#14002

deployments better. Signed-off-by: Lukas Krejci <lkrejci@redhat.com>

musienko-maxim · 2019-08-05T20:12:53Z

E2E Happy path tests of Eclipse Che Single User on K8S (minikube v1.1.1) has failed:

Build details
docker image: docker.io/maxura/che-server:14134
test artifacts
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

dmytro-ndp · 2019-08-06T05:49:54Z

ci-test

che-bot · 2019-08-06T06:32:52Z

Results of automated E2E tests of Eclipse Che Multiuser on OCP:
Build details
Test report
docker image: eclipseche/che-server:14134
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

che-bot · 2019-08-06T06:42:36Z

E2E Happy path tests of Eclipse Che Single User on K8S (minikube v1.1.1) has failed:

Build details
docker image: docker.io/maxura/che-server:14134
test artifacts
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

che-bot · 2019-08-06T07:26:53Z

E2E Happy path tests of Eclipse Che Single User on K8S (minikube v1.1.1) has failed:

Build details
docker image: docker.io/maxura/che-server:14134
test artifacts
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

che-bot · 2019-08-06T07:48:11Z

E2E Happy path tests of Eclipse Che Single User on K8S (minikube v1.1.1) has failed:

Build details
docker image: docker.io/maxura/che-server:14134
test artifacts
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

metlos · 2019-08-06T07:59:12Z

@dmytro-ndp, would you know what version of nginx-ingress-controller is running in the k8s cluster that the happy path tests are using?

metlos · 2019-08-06T08:00:33Z

if you have access, find the pod of the controller in the kube-system namespace and tell me the name of the image that the pod's container is running.

metlos · 2019-08-06T08:10:42Z

ah, I see the happy path is running on minikube 1.1.1 which would explain the failures. Currently, this PR doesn't work with that yet as explained in the description.

…properties to make more sense. Signed-off-by: Lukas Krejci <lkrejci@redhat.com>

Signed-off-by: Lukas Krejci <lkrejci@redhat.com>

che-bot · 2019-08-07T17:28:13Z

E2E Happy path tests of Eclipse Che Single User on K8S (minikube v1.1.1) has been successful:

build details
"che-server" docker image: docker.io/maxura/che-server:14134

metlos · 2019-08-09T10:40:27Z

So what is this CRW Jenkins job? I get a 404 when trying to access the details..

metlos · 2019-08-09T10:40:43Z

@eclipse/eclipse-che-qa ^

dmytro-ndp · 2019-08-09T11:53:31Z

Aha, I see. You mentioned CRW Jenkins in review section.
Please, ignore that - it was a job for verifying new pipeline job for PR check.

Signed-off-by: Lukas Krejci <lkrejci@redhat.com>

che-bot · 2019-08-23T11:19:51Z

E2E Happy path tests of Eclipse Che Single User on K8S (minikube v1.1.1) has failed:

build details
"che-server" docker image: maxura/che-server:14134
test artifacts
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.
Use command "crw-ci-test" to rerun the test.

metlos · 2019-08-23T11:53:55Z

crw-ci-test

Signed-off-by: Lukas Krejci <lkrejci@redhat.com>

che-bot · 2019-08-23T11:56:36Z

E2E tests of Eclipse Che Multiuser on OCP has failed:

Build details
Test report
docker image: eclipseche/che-server:14134
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.
Use command "ci-test" to rerun the test.

che-bot · 2019-08-23T12:03:56Z

E2E Happy path tests of Eclipse Che Single User on K8S (minikube v1.1.1) has failed:

build details
"che-server" docker image: maxura/che-server:14134
test artifacts
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.
Use command "crw-ci-test" to rerun the test.

che-bot · 2019-08-23T12:05:36Z

E2E Happy path tests of Eclipse Che Single User on K8S (minikube v1.1.1) has failed:

build details
"che-server" docker image: maxura/che-server:14134
test artifacts
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.
Use command "crw-ci-test" to rerun the test.

metlos · 2019-08-23T12:13:57Z

@dmytro-ndp I don't see how the happy path failures are related to the changes in this PR. Could you please confirm that they're failing for other reasons?

...se/che/workspace/infrastructure/kubernetes/server/external/IngressPathTransformInverter.java

...g/eclipse/che/workspace/infrastructure/kubernetes/server/external/ExternalServerExposer.java

che-bot · 2019-08-23T12:35:21Z

E2E tests of Eclipse Che Multiuser on OCP has failed:

Build details
Test report
docker image: eclipseche/che-server:14134
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.
Use command "ci-test" to rerun the test.

sleshchenko

I've not tested your changes and reviewed quite deeply.

@amisevsk Maybe you're able to do another round of review as well

Good job! LGTM

metlos · 2019-08-23T14:01:28Z

ci-build

Signed-off-by: Lukas Krejci <lkrejci@redhat.com>

che-bot · 2019-08-23T14:09:01Z

E2E Happy path tests of Eclipse Che Single User on K8S (minikube v1.1.1) has failed:

build details
"che-server" docker image: maxura/che-server:14134
test artifacts
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.
Use command "crw-ci-test" to rerun the test.

che-bot · 2019-08-23T14:50:27Z

E2E tests of Eclipse Che Multiuser on OCP has failed:

Build details
Test report
docker image: eclipseche/che-server:14134
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.
Use command "ci-test" to rerun the test.

dmytro-ndp · 2019-08-23T14:55:08Z

@metlos:

@dmytro-ndp I don't see how the happy path failures are related to the changes in this PR. Could you please confirm that they're failing for other reasons?

I confirm that regression #14134 (comment) is not related to your PR directly. That is because of outdated Jenkinsfile which doesn't contain workaround to known issue #14202.
I would recommend you to update your PR with Jenkinsfile changes from master, where we turned off unit tests in time of build of Che.

Signed-off-by: Lukas Krejci <lkrejci@redhat.com>

che-bot · 2019-08-23T15:08:32Z

E2E Happy path tests of Eclipse Che Single User on K8S (minikube v1.1.1) has been successful:

build details
"che-server" docker image: maxura/che-server:14134

che-bot · 2019-08-23T15:19:27Z

E2E tests of Eclipse Che Multiuser on OCP has failed:

Build details
Test report
docker image: eclipseche/che-server:14134
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.
Use command "ci-test" to rerun the test.

amisevsk

I'm okay with merge but would suggest tests for the PathDemangler -- currently only the trivial case is handled.

I'm unable to test this PR manually, so take my approval with a pinch of salt.

...g/eclipse/che/workspace/infrastructure/kubernetes/server/external/ExternalServerExposer.java

...se/che/workspace/infrastructure/kubernetes/server/external/IngressPathTransformInverter.java

...org/eclipse/che/workspace/infrastructure/kubernetes/server/KubernetesServerResolverTest.java

Signed-off-by: Lukas Krejci <lkrejci@redhat.com>

che-bot · 2019-08-26T11:19:07Z

E2E Happy path tests of Eclipse Che Single User on K8S (minikube v1.1.1) has been successful:

build details
"che-server" docker image: maxura/che-server:14134

che-bot · 2019-08-26T11:47:25Z

E2E tests of Eclipse Che Multiuser on OCP has been successful:

Build details
Test report
docker image: eclipseche/che-server:14134

amisevsk

LGTM, thanks @metlos

Generalize the ingress configuration to support single-host kubernetes

5030c89

deployments better. Signed-off-by: Lukas Krejci <lkrejci@redhat.com>

che-bot added kind/task Internal things, technical debt, and to-do tasks to be performed. status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. labels Aug 5, 2019

metlos mentioned this pull request Aug 6, 2019

Spike: PoC for single-host/default-host mode for Che Theia #14002

Closed

eclipse-che deleted a comment from che-bot Aug 6, 2019

metlos added 4 commits August 7, 2019 13:49

Fixed the path transform regex and update the description in the che.…

a69ed76

…properties to make more sense. Signed-off-by: Lukas Krejci <lkrejci@redhat.com>

Reduced the repetition in the impls of server exposure strategy.

824b439

Signed-off-by: Lukas Krejci <lkrejci@redhat.com>

Fix the multi-host exposure strategy.

00b052c

Signed-off-by: Lukas Krejci <lkrejci@redhat.com>

Merge remote-tracking branch 'upstream/master' into single-host

137bd11

Signed-off-by: Lukas Krejci <lkrejci@redhat.com>

metlos marked this pull request as ready for review August 9, 2019 10:35

metlos requested review from amisevsk, ibuziuk, l0rd, nickboldt, rhopp and sleshchenko as code owners August 9, 2019 10:35

metlos changed the title ~~Generalize the ingress configuration to support single-host on kubernetes~~ Generalize the ingress configuration to support single-host in single-user mode on kubernetes Aug 9, 2019

Better naming and simplifications

ae7f8c1

Signed-off-by: Lukas Krejci <lkrejci@redhat.com>

Better variable name.

7de04c6

Signed-off-by: Lukas Krejci <lkrejci@redhat.com>

metlos mentioned this pull request Aug 23, 2019

Bring che operator in line with the latest changes coming to Che server to support single-host mode. eclipse-che/che-operator#73

Merged

sleshchenko reviewed Aug 23, 2019

View reviewed changes

...se/che/workspace/infrastructure/kubernetes/server/external/IngressPathTransformInverter.java Outdated Show resolved Hide resolved

sleshchenko reviewed Aug 23, 2019

View reviewed changes

...g/eclipse/che/workspace/infrastructure/kubernetes/server/external/ExternalServerExposer.java Show resolved Hide resolved

sleshchenko approved these changes Aug 23, 2019

View reviewed changes

Rephrase the confusing javadoc.

0659105

Signed-off-by: Lukas Krejci <lkrejci@redhat.com>

Merge remote-tracking branch 'upstream/master' into single-host

231b086

Signed-off-by: Lukas Krejci <lkrejci@redhat.com>

amisevsk reviewed Aug 23, 2019

View reviewed changes

Some javadocs, better names, code simplification and tests.

ea4121f

Signed-off-by: Lukas Krejci <lkrejci@redhat.com>

amisevsk approved these changes Aug 26, 2019

View reviewed changes

skabashnyuk approved these changes Aug 26, 2019

View reviewed changes

metlos merged commit af26d29 into eclipse-che:master Aug 26, 2019

che-bot added this to the 7.1.0 milestone Aug 26, 2019

che-bot removed the status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. label Aug 26, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Generalize the ingress configuration to support single-host in single-user mode on kubernetes #14134

Generalize the ingress configuration to support single-host in single-user mode on kubernetes #14134

metlos commented Aug 5, 2019 •

edited

Loading

musienko-maxim commented Aug 5, 2019

dmytro-ndp commented Aug 6, 2019

che-bot commented Aug 6, 2019

che-bot commented Aug 6, 2019

che-bot commented Aug 6, 2019

che-bot commented Aug 6, 2019

metlos commented Aug 6, 2019 •

edited

Loading

metlos commented Aug 6, 2019

metlos commented Aug 6, 2019

che-bot commented Aug 7, 2019

metlos commented Aug 9, 2019

metlos commented Aug 9, 2019

dmytro-ndp commented Aug 9, 2019 •

edited

Loading

che-bot commented Aug 23, 2019

metlos commented Aug 23, 2019

che-bot commented Aug 23, 2019

che-bot commented Aug 23, 2019

che-bot commented Aug 23, 2019

metlos commented Aug 23, 2019

che-bot commented Aug 23, 2019

sleshchenko left a comment

metlos commented Aug 23, 2019

che-bot commented Aug 23, 2019

che-bot commented Aug 23, 2019

dmytro-ndp commented Aug 23, 2019

che-bot commented Aug 23, 2019

che-bot commented Aug 23, 2019

amisevsk left a comment

che-bot commented Aug 26, 2019

che-bot commented Aug 26, 2019

amisevsk left a comment

Generalize the ingress configuration to support single-host in single-user mode on kubernetes #14134

Generalize the ingress configuration to support single-host in single-user mode on kubernetes #14134

Conversation

metlos commented Aug 5, 2019 • edited Loading

What does this PR do?

What issues does this PR fix or reference?

musienko-maxim commented Aug 5, 2019

dmytro-ndp commented Aug 6, 2019

che-bot commented Aug 6, 2019

che-bot commented Aug 6, 2019

che-bot commented Aug 6, 2019

che-bot commented Aug 6, 2019

metlos commented Aug 6, 2019 • edited Loading

metlos commented Aug 6, 2019

metlos commented Aug 6, 2019

che-bot commented Aug 7, 2019

metlos commented Aug 9, 2019

metlos commented Aug 9, 2019

dmytro-ndp commented Aug 9, 2019 • edited Loading

che-bot commented Aug 23, 2019

metlos commented Aug 23, 2019

che-bot commented Aug 23, 2019

che-bot commented Aug 23, 2019

che-bot commented Aug 23, 2019

metlos commented Aug 23, 2019

che-bot commented Aug 23, 2019

sleshchenko left a comment

Choose a reason for hiding this comment

metlos commented Aug 23, 2019

che-bot commented Aug 23, 2019

che-bot commented Aug 23, 2019

dmytro-ndp commented Aug 23, 2019

che-bot commented Aug 23, 2019

che-bot commented Aug 23, 2019

amisevsk left a comment

Choose a reason for hiding this comment

che-bot commented Aug 26, 2019

che-bot commented Aug 26, 2019

amisevsk left a comment

Choose a reason for hiding this comment

metlos commented Aug 5, 2019 •

edited

Loading

metlos commented Aug 6, 2019 •

edited

Loading

dmytro-ndp commented Aug 9, 2019 •

edited

Loading