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

UPSTREAM: 58533: add suggestion to describe pod for container names #18178

Merged
merged 2 commits into from
Feb 5, 2018
Merged

UPSTREAM: 58533: add suggestion to describe pod for container names #18178

merged 2 commits into from
Feb 5, 2018

Conversation

juanvallejo
Copy link
Contributor

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1389208

Usability improvement: Suggest using oc describe <pod> to retrieve all pod containers to use with cmds that stream to/from pods.

cc @soltysh

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 18, 2018
@openshift-merge-robot openshift-merge-robot added the vendor-update Touching vendor dir or related files label Jan 18, 2018
@juanvallejo juanvallejo force-pushed the jvallejo/usability-add-oc-describe-suggestion branch from cc33254 to 3d5e9d5 Compare January 18, 2018 23:38
soltysh
soltysh requested changes Jan 19, 2018
View reviewed changes
Copy link
Member

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

The change itself lgtm, but I want to see an upstream pr first and an appropriate number in the commit message.

@juanvallejo juanvallejo force-pushed the jvallejo/usability-add-oc-describe-suggestion branch from 3d5e9d5 to 45da559 Compare January 19, 2018 19:43
@juanvallejo juanvallejo changed the title add suggestion to describe pod for container names UPSTREAM: 58533: add suggestion to describe pod for container names Jan 19, 2018
@juanvallejo
Copy link
Contributor Author

Upstream: kubernetes/kubernetes#58533

@juanvallejo
Copy link
Contributor Author

/test extended_conformance_install

@juanvallejo
Copy link
Contributor Author

/retest

1 similar comment
@juanvallejo
Copy link
Contributor Author

/retest

soltysh
soltysh approved these changes Jan 24, 2018
View reviewed changes
Copy link
Member

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/approve
Feel free to self-lgtm this when the upstream gets merged.

@soltysh
Copy link
Member

soltysh commented Jan 24, 2018

Or at least tagged for merge.

@soltysh soltysh added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 24, 2018
@deads2k
Copy link
Contributor

deads2k commented Feb 1, 2018

/hold

until upstream is in queue so we can figure out what to review and what not to review

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 1, 2018
soltysh
soltysh requested changes Feb 5, 2018
View reviewed changes
Copy link
Member

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

Update to match upstream and you're good to go.

vendor/k8s.io/kubernetes/pkg/kubectl/cmd/attach.go Outdated
@@ -312,6 +322,10 @@ func (p *AttachOptions) containerToAttachTo(pod *api.Pod) (*api.Container, error
return nil, fmt.Errorf("container not found (%s)", p.ContainerName)
}

if len(p.SuggestedCmdUsage) > 0 {
fmt.Fprintf(p.Err, "%s\n", p.SuggestedCmdUsage)
Copy link
Member

Choose a reason for hiding this comment

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

You need to update this to match upstream.

@soltysh
Copy link
Member

soltysh commented Feb 5, 2018

/approve cancel
/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 5, 2018
@juanvallejo juanvallejo force-pushed the jvallejo/usability-add-oc-describe-suggestion branch from 45da559 to 23fa9ae Compare February 5, 2018 15:59
@soltysh soltysh removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 5, 2018
@juanvallejo
Copy link
Contributor Author

@deads2k
updated upstream changes to match merged upstream PR.
updated Origin changes to ensure defaulted container name is printed

soltysh
soltysh approved these changes Feb 5, 2018
View reviewed changes
Copy link
Member

@soltysh soltysh 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

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 5, 2018
@soltysh soltysh added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 5, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: juanvallejo, soltysh

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 5, 2018 •
edited

@juanvallejo: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_conformance_gce 45da559 link /test extended_conformance_gce

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@juanvallejo
Copy link
Contributor Author

/test end_to_end

@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit 0ac009a into openshift:master Feb 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@soltysh soltysh soltysh approved these changes

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees

@soltysh soltysh

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. vendor-update Touching vendor dir or related files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@juanvallejo @soltysh @deads2k @openshift-ci-robot @openshift-merge-robot