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

list-resources: don't fail if the grep fails to match any resources #41933

Merged
merged 1 commit into from
Feb 23, 2017
Merged

list-resources: don't fail if the grep fails to match any resources #41933

merged 1 commit into from
Feb 23, 2017
+1 −1

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented Feb 22, 2017 •
edited by jessfraz
Loading

What this PR does / why we need it: if no resources are found, the grep call will exit nonzero, so guard it with || true.

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

Release note:

cc @krzyzacy @ncdc

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 22, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

The following people have approved this PR: ixdy

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

We suggest the following people:
cc @jszczepkowski
You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-none Denotes a PR that doesn't merit a release note. labels Feb 22, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@rmmh
Copy link
Contributor

rmmh commented Feb 22, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 22, 2017
@ixdy
Copy link
Member Author

ixdy commented Feb 22, 2017

@k8s-bot test this

@rmmh
Copy link
Contributor

rmmh commented Feb 22, 2017

@k8s-bot cross build this

@saad-ali
Copy link
Member

Will manually merge after a few of the runs are green to unblock submit queue.

@saad-ali
Copy link
Member

The following builds have succeeded:

Jenkins Bazel Build — Build succeeded.
Jenkins GCE Node e2e — Build succeeded.
Jenkins GCI GKE smoke e2e — Build succeeded.
Jenkins GKE smoke e2e — Build succeeded.
Jenkins Kubemark GCE e2e — Build succeeded.
Jenkins non-CRI GCE Node e2e — Build succeeded.

This should be safe to merge now. Manually merging to fix submit queue (which has been blocked all day).

@saad-ali saad-ali merged commit 9b12e37 into kubernetes:master Feb 23, 2017
@krzyzacy
Copy link
Member

@saad-ali @jessfraz you want to cherry-pick this into 1.4/1.5 branches as well.

@k8s-ci-robot
Copy link
Contributor

@ixdy: The following test(s) failed:

Test name Commit Details Rerun command
Jenkins GCE e2e eeec939 link @k8s-bot cvm gce e2e test this

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.

@saad-ali
Copy link
Member

@saad-ali @jessfraz you want to cherry-pick this into 1.4/1.5 branches as well.

Will do!

@saad-ali saad-ali added this to the v1.5 milestone Feb 23, 2017
@saad-ali saad-ali added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherrypick-candidate labels Feb 23, 2017
@saad-ali saad-ali mentioned this pull request Feb 23, 2017
Merged
saad-ali added a commit that referenced this pull request Feb 23, 2017
@saad-ali
Merge pull request #41948 from saad-ali/automated-cherry-pick-of-#419…
1f6bd7e 
…33-upstream-release-1.5

Automated cherry pick of #41933 upstream release 1.5
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.5" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@fejta
Copy link
Contributor

fejta commented Feb 28, 2017

How do we put this into 1.4?

@jessfraz jessfraz modified the milestones: v1.4, v1.5 Feb 28, 2017
@jessfraz jessfraz self-assigned this Feb 28, 2017
@jessfraz jessfraz mentioned this pull request Feb 28, 2017
Merged
@jessfraz jessfraz added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Feb 28, 2017
jessfraz added a commit that referenced this pull request Mar 14, 2017
@jessfraz
Merge pull request #42208 from jessfraz/automated-cherry-pick-of-#419…
f7c2b8c 
…33-origin-release-1.4

Automated cherry pick of #41933
@ixdy ixdy deleted the list-resources-grep branch May 15, 2018 23:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@rmmh rmmh

@jessfraz jessfraz

@saad-ali saad-ali

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.

ci-kubernetes-e2e-gci-gke failing with "Failed to list resources (exit status 1)"
10 participants
@ixdy @k8s-github-robot @k8s-reviewable @rmmh @saad-ali @krzyzacy @k8s-ci-robot @k8s-cherrypick-bot @fejta @jessfraz