pkg/ cmd/: kgctl autodetect mesh granularity #197
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
leonnicolas
force-pushed
the
autodetect_granularity
branch
from
3a1d492 to
0470794
Compare
leonnicolas
force-pushed
the
autodetect_granularity
branch
2 times, most recently
from
30f4835 to
413a465
Compare
squat
reviewed
Jun 18, 2021
cmd/kgctl/graph.go
Outdated
| // Optain the Granularity by looking at the annotation of the first node. | ||
| if opts.granularity == mesh.AutoGranularity { | ||
| if len(ns) == 0 { | ||
| return errors.New("failed to optain granularity: could not get any nodes") |
There was a problem hiding this comment.
Suggested change
| return errors.New("failed to optain granularity: could not get any nodes") | |
| return errors.New("failed to obtain granularity: could not get any nodes") |
squat
reviewed
Jun 18, 2021
cmd/kgctl/graph.go
Outdated
| @@ -38,6 +39,20 @@ func runGraph(_ *cobra.Command, _ []string) error { | |||
| if err != nil { | |||
| return fmt.Errorf("failed to list peers: %v", err) | |||
| } | |||
| // Optain the Granularity by looking at the annotation of the first node. | |||
There was a problem hiding this comment.
Suggested change
| // Optain the Granularity by looking at the annotation of the first node. | |
| // Obtain the Granularity by looking at the annotation of the first node. |
squat
reviewed
Jun 18, 2021
cmd/kgctl/showconf.go
Outdated
| @@ -121,6 +121,19 @@ func runShowConfNode(_ *cobra.Command, args []string) error { | |||
| if err != nil { | |||
| return fmt.Errorf("failed to list peers: %v", err) | |||
| } | |||
| // Optain the Granularity by looking at the annotation of the first node. | |||
There was a problem hiding this comment.
Suggested change
| // Optain the Granularity by looking at the annotation of the first node. | |
| // Obtain the Granularity by looking at the annotation of the first node. |
squat
reviewed
Jun 18, 2021
cmd/kgctl/showconf.go
Outdated
| // Optain the Granularity by looking at the annotation of the first node. | ||
| if opts.granularity == mesh.AutoGranularity { | ||
| if len(ns) == 0 { | ||
| return errors.New("failed to optain granularity: could not get any nodes") |
There was a problem hiding this comment.
Suggested change
| return errors.New("failed to optain granularity: could not get any nodes") | |
| return errors.New("failed to obtain granularity: could not get any nodes") |
squat
reviewed
Jun 18, 2021
cmd/kgctl/showconf.go
Outdated
| case mesh.LogicalGranularity: | ||
| case mesh.FullGranularity: | ||
| default: | ||
| return fmt.Errorf("mesh granularity %v unsupported", opts.granularity) |
There was a problem hiding this comment.
maybe we can make this a more complete phrase?
Suggested change
| return fmt.Errorf("mesh granularity %v unsupported", opts.granularity) | |
| return fmt.Errorf("mesh granularity %q is not supported", opts.granularity) |
and same above and below.
Also, I think it's nice to quote the values that produce the error to show that it is something funny that came from the user
squat
reviewed
Jun 18, 2021
cmd/kgctl/showconf.go
Outdated
| @@ -208,6 +221,19 @@ func runShowConfPeer(_ *cobra.Command, args []string) error { | |||
| if err != nil { | |||
| return fmt.Errorf("failed to list peers: %v", err) | |||
| } | |||
| // Optain the Granularity by looking at the annotation of the first node. | |||
There was a problem hiding this comment.
Suggested change
| // Optain the Granularity by looking at the annotation of the first node. | |
| // Obtain the Granularity by looking at the annotation of the first node. |
squat
reviewed
Jun 18, 2021
cmd/kgctl/showconf.go
Outdated
| // Optain the Granularity by looking at the annotation of the first node. | ||
| if opts.granularity == mesh.AutoGranularity { | ||
| if len(ns) == 0 { | ||
| return errors.New("failed to optain granularity: could not get any nodes") |
There was a problem hiding this comment.
Suggested change
| return errors.New("failed to optain granularity: could not get any nodes") | |
| return errors.New("failed to obtain granularity: could not get any nodes") |
squat
reviewed
Jun 18, 2021
cmd/kgctl/graph.go
Outdated
| @@ -38,6 +39,20 @@ func runGraph(_ *cobra.Command, _ []string) error { | |||
| if err != nil { | |||
| return fmt.Errorf("failed to list peers: %v", err) | |||
| } | |||
| // Optain the Granularity by looking at the annotation of the first node. | |||
| if opts.granularity == mesh.AutoGranularity { | |||
There was a problem hiding this comment.
How about we turn this block into a helper since we seem to have the same logic repeated 3 times?
squat
reviewed
Jun 18, 2021
There was a problem hiding this comment.
Nice I like this idea. I think that in the future, we could stick all of these annotations that report a status, vs the ones that are declarative, into a json struct in a kilo.squat.ai/status annotation. I think this could be clearer for the user and would avoid people thinking they can edit the annotations
leonnicolas
force-pushed
the
autodetect_granularity
branch
from
413a465 to
4584f01
Compare
Addes granularity annotation to auto detect the mesh granularity when using kubectl Signed-off-by: leonnicolas <leonloechner@gmx.de>
leonnicolas
force-pushed
the
autodetect_granularity
branch
from
4584f01 to
088578b
Compare
squat
approved these changes
Jun 18, 2021
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.
Addes granularity annotation to auto detect the mesh granularity when
using
kubectlSigned-off-by: leonnicolas leonloechner@gmx.de