🐛 clusterworkspaceshard: fix admission and shard creation for multi-shard setups #2360
Conversation
This file contains 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
sttts
force-pushed
the
sttts-shard-admission
branch
2 times, most recently
from
e1f6ea6 to
03bcc6f
Compare
p0lyn0mial
reviewed
Nov 15, 2022
pkg/server/server.go
Outdated
| @@ -186,6 +183,9 @@ func (s *Server) Run(ctx context.Context) error { | |||
|
|
|||
| if s.Options.Extra.ShardName == tenancyv1alpha1.RootShard { | |||
| logger.Info("bootstrapping root workspace phase 0") | |||
|
|
|||
| s.RootShardKcpClusterClient = s.KcpClusterClient | |||
There was a problem hiding this comment.
seems this is not needed as we assign in the config.go
p0lyn0mial
reviewed
Nov 15, 2022
| shard := &tenancyv1alpha1.ClusterWorkspaceShard{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: s.Options.Extra.ShardName, | ||
| Annotations: map[string]string{logicalcluster.AnnotationKey: tenancyv1alpha1.RootCluster.String()}, |
There was a problem hiding this comment.
not s.Options.Extra.ShardName ?
There was a problem hiding this comment.
no, this is just for logging
There was a problem hiding this comment.
in the future we will put a shard name as an annotation
sttts
force-pushed
the
sttts-shard-admission
branch
from
03bcc6f to
06620e0
Compare
sttts
force-pushed
the
sttts-shard-admission
branch
from
06620e0 to
11aaa31
Compare
|
/lgtm |
|
/approve |
|
[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
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.
Admission is not the right place to default the shard.status URLs values as it is run on the server side and the server side is always the root shard. This PR moves it into the server initialization "client-side".