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.

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 display of virtctl help text for other usages #4265

Merged
merged 1 commit into from Oct 2, 2020
Merged

Fix display of virtctl help text for other usages #4265

merged 1 commit into from Oct 2, 2020

Conversation

dhiller
Copy link
Contributor

@dhiller dhiller commented Sep 25, 2020

What this PR does / why we need it:

In the case where either the virtctl binary or the symlink does not exactly
match the expectation the name virtctl is displayed in the help text.
This is now generalized by only looking for the suffix -virt and then
displaying ... virt in the help text.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Release note:

Fix virtctl help text when running as a plugin

@kubevirt-bot kubevirt-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: no Indicates the PR's author has not DCO signed all their commits. size/M labels Sep 25, 2020
@kubevirt-bot kubevirt-bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. and removed dco-signoff: no Indicates the PR's author has not DCO signed all their commits. labels Sep 25, 2020
@dhiller
Copy link
Contributor Author

dhiller commented Sep 28, 2020

/test pull-kubevirt-e2e-k8s-1.18

@openshift-ci-robot
Copy link
Collaborator

@dhiller: The specified target(s) for /test were not found.
The following commands are available to trigger jobs:

  • /test images

Use /test all to run all jobs.

In response to this:

/test pull-kubevirt-e2e-k8s-1.18

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ashleyschuett
Copy link
Contributor

/lgtm

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Sep 29, 2020
rmohr
rmohr reviewed Sep 30, 2020
View reviewed changes
pkg/virtctl/root.go Outdated
// see also templates.go
func GetProgramName(binary string) string {
if strings.HasSuffix(binary, "-virt") {
return binary[0:len(binary)-len("-virt")] + " virt"
Copy link
Member

@rmohr rmohr Sep 30, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about fmt.Sprintf("%s virt", strings.TrimSuffix(binary, "-virt"))?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the suggestion, replaced.

@dhiller
Fix display of virtctl help text for other usages
f1b9d8b 
In case where either the virtctl binary or the symlink does not exactly
match the expectation the name virtctl is displayed in the help text.
This is now generalized by only looking for the suffix `-virt` and then
displaying `... virt` in the help text.

Signed-off-by: Daniel Hiller <daniel.hiller.1972@gmail.com>
@kubevirt-bot kubevirt-bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 30, 2020
rmohr
rmohr reviewed Sep 30, 2020
View reviewed changes
Copy link
Member

@rmohr rmohr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Sep 30, 2020
@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rmohr

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubevirt-bot kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 30, 2020
@kubevirt-commenter-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs.
Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

3 similar comments
@kubevirt-commenter-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs.
Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@kubevirt-commenter-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs.
Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@kubevirt-commenter-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs.
Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@kubevirt-bot kubevirt-bot merged commit 7b88627 into kubevirt:master Oct 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rmohr rmohr rmohr left review comments

@ashleyschuett ashleyschuett Awaiting requested review from ashleyschuett

@jean-edouard jean-edouard Awaiting requested review from jean-edouard

Assignees

@rmohr rmohr

@ashleyschuett ashleyschuett

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@dhiller @openshift-ci-robot @ashleyschuett @kubevirt-bot @kubevirt-commenter-bot @rmohr