Make ctp list derive context from kubeconfig #457
Merged
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
sttts
reviewed
Apr 2, 2024
sttts
reviewed
Apr 2, 2024
sttts
reviewed
Apr 2, 2024
sttts
reviewed
Apr 2, 2024
tnthornton
reviewed
Apr 2, 2024
sttts
reviewed
Apr 4, 2024
sttts
reviewed
Apr 10, 2024
sttts
reviewed
Apr 10, 2024
sttts
reviewed
Apr 10, 2024
cmd/up/controlplane/list.go
Outdated
Comment on lines
57
to
70
| po := clientcmd.NewDefaultPathOptions() | ||
| conf, err := po.GetStartingConfig() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| profiles, err := upCtx.Cfg.GetUpboundProfiles() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| _, curprof, ctp, err := profile.FromKubeconfig(ctx, profiles, conf) |
There was a problem hiding this comment.
Dieser ganze Block wird häufig auftreten. Wir sollten einen Helper dazu erstellen:
profileName, profile, ctp, restConfig, err := upCtx.Cfg.GetCurrentContext(ctx)
There was a problem hiding this comment.
English translation:
This whole block will occur frequently. We should create a helper for this:
sttts
reviewed
Apr 10, 2024
sttts
reviewed
Apr 10, 2024
sttts
reviewed
Apr 10, 2024
sttts
reviewed
Apr 10, 2024
sttts
reviewed
Apr 15, 2024
internal/config/config.go
Outdated
| @@ -122,6 +125,26 @@ func (c *Config) GetUpboundProfile(name string) (profile.Profile, error) { | |||
| return p, nil | |||
| } | |||
|
|
|||
| // GetCurrentContext returns the current context from the kubeconfig, profile and config | |||
| func (c *Config) GetCurrentContext(ctx context.Context) (string, *profile.Profile, types.NamespacedName, error) { | |||
There was a problem hiding this comment.
add names to the return values. It's unclear what the string is.
There was a problem hiding this comment.
also to FromKubeconfig please. I also forgot that.
There was a problem hiding this comment.
added return named values to both functions
sttts
changed the title
Signed-off-by: Piotr Zaniewski <piotr@upbound.io> Signed-off-by: Dr. Stefan Schimanski <stefan.schimanski@upbound.com>
| c.client = cloud.New(ctpclient, cfgclient, upCtx.Account) | ||
| } | ||
|
|
||
| func (c *listCmd) AfterApply(kongCtx *kong.Context) error { | ||
| kongCtx.Bind(pterm.DefaultTable.WithWriter(kongCtx.Stdout).WithSeparator(" ")) |
There was a problem hiding this comment.
Should we check for mutual exclusivity with -g and -A?
There was a problem hiding this comment.
In kube -A trumps over -n afaik. No strong opinion whether we are stricter here.
3 tasks
RedbackThomson
approved these changes
Apr 17, 2024
3 tasks
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.
Description of your changes
This PR makes
up ctp listkubeconfig context aware, making it independent from the current profile. The profile is automatically derived:$ kubectl ctx not-space-kube
$ up ctp list
You are not on a space.
$ kubectl ctx space
$ up ctp list
.... controlplanes from the profile matching the kubeconfig context's URL ....
$ up ctp connect ctp
$ up ctp list
In a controlplane, you cannot list controlplanes.
Use 'up ctx ..' to go to group level.
Fixes https://github.com/upbound/spaces/issues/752
NOTE: this breaks the use against a cloud profile. We will bring it back in a follow-up.
I have:
make reviewableto ensure this PR is ready for review.Addedbackport release-x.ylabels to auto-backport this PR, as appropriate.How has this code been tested
This can be tested locally by running the following setup: