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

Automated cherry pick of #53450 #53457

Merged
merged 1 commit into from
Oct 5, 2017
Merged

Automated cherry pick of #53450 #53457

merged 1 commit into from
Oct 5, 2017

Conversation

nicksardo
Copy link
Contributor

@nicksardo nicksardo commented Oct 4, 2017 •
edited
Loading

Cherry pick of #53450 on release-1.7.

#53450: Ignore notFound when deleting firewall

Release note:

GCE: Fix issue deleting internal load balancers when the firewall resource may not exist.

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 4, 2017
@k8s-github-robot k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Oct 4, 2017
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Oct 4, 2017
@nicksardo
Copy link
Contributor Author

/assign @MrHohn @wojtek-t
/unassign vishh erictune

@k8s-ci-robot k8s-ci-robot assigned MrHohn and wojtek-t and unassigned vishh and erictune Oct 4, 2017
MrHohn
MrHohn reviewed Oct 4, 2017
View reviewed changes
pkg/cloudprovider/providers/gce/gce_loadbalancer_internal.go Outdated
if err := gce.DeleteFirewall(hcFirewallName); err != nil && !isNotFound(err) {
=======
Copy link
Member

Choose a reason for hiding this comment

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

Oops, commit conflict here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oops, thanks

@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 4, 2017
@nicksardo nicksardo force-pushed the automated-cherry-pick-of-#53450-upstream-release-1.7 branch from a53d786 to 7438520 Compare October 4, 2017 19:41
MrHohn
MrHohn approved these changes Oct 4, 2017
View reviewed changes
Copy link
Member

@MrHohn MrHohn left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 4, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MrHohn, nicksardo

Associated issue: 53450

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

@wojtek-t wojtek-t added this to the v1.7 milestone Oct 5, 2017
@wojtek-t
Copy link
Member

wojtek-t commented Oct 5, 2017

@nicksardo - please add a user-friendly release note for the parent PR.

@k8s-ci-robot k8s-ci-robot 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 Oct 5, 2017
@nicksardo
Copy link
Contributor Author

@wojtek-t Done

@wojtek-t wojtek-t added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Oct 5, 2017
@k8s-github-robot
Copy link

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

@k8s-github-robot
Copy link

Automatic merge from submit-queue.

@k8s-github-robot k8s-github-robot merged commit 5adaee2 into kubernetes:release-1.7 Oct 5, 2017
@k8s-ci-robot
Copy link
Contributor

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

Test name Commit Details Rerun command
pull-kubernetes-e2e-gce-bazel 7438520 link /test pull-kubernetes-e2e-gce-bazel

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.

@nicksardo nicksardo deleted the automated-cherry-pick-of-#53450-upstream-release-1.7 branch January 12, 2018 06:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MrHohn MrHohn MrHohn approved these changes

Assignees

@MrHohn MrHohn

@wojtek-t wojtek-t

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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.7
Development

Successfully merging this pull request may close these issues.
7 participants
@nicksardo @k8s-github-robot @wojtek-t @k8s-ci-robot @MrHohn @vishh @erictune