use ClusterWorkspaceShard.VirtualWorkspaceURL #1670
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci
bot
added
the
kind/api-change
|
requires #1669 |
|
/retest |
p0lyn0mial
force-pushed
the
wire-cws-vw-url
branch
from
cad1fc3 to
1c44f88
Compare
|
/assign @sttts |
sttts
reviewed
Aug 3, 2022
pkg/apis/tenancy/v1alpha1/types.go
Outdated
| @@ -496,6 +496,17 @@ type ClusterWorkspaceShardSpec struct { | |||
| // +kubebuilder:Required | |||
| // +required | |||
| ExternalURL string `json:"externalURL"` | |||
|
|
|||
| // VirtualWorkspaceURL is the address of the virtual workspace server associated with this shard. | |||
p0lyn0mial
force-pushed
the
wire-cws-vw-url
branch
from
1c44f88 to
e05cedf
Compare
p0lyn0mial
commented
Aug 3, 2022
| @@ -3,6 +3,7 @@ kind: ClusterWorkspaceShard | |||
| metadata: | |||
| name: SHARD_NAME | |||
| spec: | |||
| virtualWorkspaceURL: SHARD_VIRTUAL_WORKSPACE_URL | |||
There was a problem hiding this comment.
I think this is backward compatible.
p0lyn0mial
commented
Aug 3, 2022
| @@ -133,6 +133,10 @@ func (o *clusterWorkspaceShard) Admit(_ context.Context, a admission.Attributes, | |||
| } | |||
| } | |||
|
|
|||
| if cws.Spec.VirtualWorkspaceURL == "" { | |||
| cws.Spec.VirtualWorkspaceURL = cws.Spec.BaseURL | |||
There was a problem hiding this comment.
this is where a default value is applied.
|
/retest |
p0lyn0mial
force-pushed
the
wire-cws-vw-url
branch
from
e05cedf to
fd52ce7
Compare
sttts
reviewed
Aug 4, 2022
| @@ -32,6 +31,7 @@ import ( | |||
|
|
|||
| "github.com/kcp-dev/kcp/pkg/admission/helpers" | |||
| tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" | |||
| "github.com/kcp-dev/logicalcluster/v2" | |||
There was a problem hiding this comment.
correct order? is openshift-imports happy?
|
/lgtm |
|
[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 |
openshift-ci
bot
added
the
approved
when set points to an external URL address of a virtual workspace server associated with as shard. Defaults to shard's base address.
p0lyn0mial
force-pushed
the
wire-cws-vw-url
branch
from
fd52ce7 to
62a5107
Compare
|
New changes are detected. LGTM label has been removed. |
|
import not happy, please re-tag |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
this PR:
shard-virtual-workspace-urlflag.when set points to an external URL address of a virtual workspace server
associated with as shard.
Related issue(s)
Fixes #