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.

Sign up for GitHub

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

Jump to bottom

Fix linkerd check --output flag description #11145

Merged
merged 1 commit into from
Jul 24, 2023
Merged

Fix linkerd check --output flag description #11145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion EXTENSIONS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ following flags:

* `--namespace`/`-n`: Namespace to use for –proxy checks (default: all
namespaces)
* `--output`/`-o`: Output format. One of: table, json
* `--output`/`-o`: Output format. One of: table, json, short
* `--pre`: Only run pre-installation checks, to determine if the extension can
be installed
* `--proxy`: Only run data-plane checks, to determine if the data plane is
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func (options *checkOptions) checkFlagSet() *pflag.FlagSet {

flags.StringVar(&options.versionOverride, "expected-version", options.versionOverride, "Overrides the version used when checking if Linkerd is running the latest version (mostly for testing)")
flags.StringVar(&options.cliVersionOverride, "cli-version-override", "", "Used to override the version of the cli (mostly for testing)")
flags.StringVarP(&options.output, "output", "o", options.output, "Output format. One of: basic, json, short")
flags.StringVarP(&options.output, "output", "o", options.output, "Output format. One of: table, json, short")
flags.DurationVar(&options.wait, "wait", options.wait, "Maximum allowed time for all tests to pass")

return flags
Expand Down
2 changes: 1 addition & 1 deletion jaeger/cmd/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ code.`,
},
}

cmd.Flags().StringVarP(&options.output, "output", "o", options.output, "Output format. One of: basic, json")
cmd.Flags().StringVarP(&options.output, "output", "o", options.output, "Output format. One of: table, json, short")
cmd.Flags().DurationVar(&options.wait, "wait", options.wait, "Maximum allowed time for all tests to pass")
cmd.Flags().BoolVar(&options.proxy, "proxy", options.proxy, "Also run data-plane checks, to determine if the data plane is healthy")
cmd.Flags().StringVarP(&options.namespace, "namespace", "n", options.namespace, "Namespace to use for --proxy checks (default: all namespaces)")
Expand Down
2 changes: 1 addition & 1 deletion multicluster/cmd/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ non-zero exit code.`,
return configureAndRunChecks(stdout, stderr, options)
},
}
cmd.Flags().StringVarP(&options.output, "output", "o", options.output, "Output format. One of: basic, json")
cmd.Flags().StringVarP(&options.output, "output", "o", options.output, "Output format. One of: table, json, short")
cmd.Flags().DurationVar(&options.wait, "wait", options.wait, "Maximum allowed time for all tests to pass")
cmd.Flags().Bool("proxy", false, "")
cmd.Flags().MarkHidden("proxy")
Expand Down
2 changes: 1 addition & 1 deletion viz/cmd/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ code.`,
},
}

cmd.Flags().StringVarP(&options.output, "output", "o", options.output, "Output format. One of: basic, json")
cmd.Flags().StringVarP(&options.output, "output", "o", options.output, "Output format. One of: table, json, short")
cmd.Flags().BoolVar(&options.proxy, "proxy", options.proxy, "Also run data-plane checks, to determine if the data plane is healthy")
cmd.Flags().DurationVar(&options.wait, "wait", options.wait, "Maximum allowed time for all tests to pass")
cmd.Flags().StringVarP(&options.namespace, "namespace", "n", options.namespace, "Namespace to use for --proxy checks (default: all namespaces)")
Expand Down
Loading