Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

server/home: create home workspace with final URL on ~ access #1530

Merged
merged 2 commits into from
Jul 15, 2022

Conversation

sttts
Copy link
Member

@sttts sttts commented Jul 15, 2022

Solving this TODO:

// TODO: The way we build this URL here is not fully compatible with sharding long-term:
// - short term (what is done now): use genericConfig.ExternalAddress
// - medium term: shards will know their name eventually, and with that we can lookup the external URL of the shard
// - long-term: create home workspace already on `~` access in order to make scheduling happen and then we know the real external URL.

We need this earlier than we expected. In the sharded setup the ~ workspace has to point to the external URL, not the shard base URL.

@openshift-ci openshift-ci bot requested review from davidfestal and ncdc July 15, 2022 06:52
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 15, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sttts

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 15, 2022
@sttts sttts force-pushed the sttts-home-create-on-tilde branch from 6234f03 to 1f8346d Compare July 15, 2022 06:52
@sttts
Copy link
Member Author

sttts commented Jul 15, 2022

/cherry-pick release-0.6

@openshift-cherrypick-robot

@sttts: once the present PR merges, I will cherry-pick it on top of release-0.6 in a new PR and assign it to you.

In response to this:

/cherry-pick release-0.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@davidfestal
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 15, 2022
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 15, 2022
@sttts sttts force-pushed the sttts-home-create-on-tilde branch from 1f8346d to b48f147 Compare July 15, 2022 13:03
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 15, 2022
@sttts sttts removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 15, 2022
@davidfestal
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 15, 2022
@openshift-ci openshift-ci bot merged commit b87d0c1 into kcp-dev:main Jul 15, 2022
@openshift-cherrypick-robot

@sttts: #1530 failed to apply on top of branch "release-0.6":

Applying: server/home: simplify unit tests with builder pattern
Applying: server/home: create home workspace with final URL on ~ access
Using index info to reconstruct a base tree...
M	test/e2e/homeworkspaces/home_workspaces_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/homeworkspaces/home_workspaces_test.go
CONFLICT (content): Merge conflict in test/e2e/homeworkspaces/home_workspaces_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 server/home: create home workspace with final URL on ~ access
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/workspaces lgtm Indicates that a PR is ready to be merged. priority/urgent
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants