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

Don't flush the nat table twice. #56728

Merged
merged 1 commit into from
Dec 5, 2017
Merged

Don't flush the nat table twice. #56728

merged 1 commit into from
Dec 5, 2017

Conversation

dnardo
Copy link
Contributor

@dnardo dnardo commented Dec 2, 2017 •
edited
Loading

This was missed when I cherry picked the original CL back. Also fix the test startup script to match
the GCE startup script.

What this PR does / why we need it:

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 #56727

Special notes for your reviewer:

Release note:

 Fixes issue where masquerade rules are flushed in GCE k8s clusters.

Don't flush the nat table twice. This was missed when I cherry picked
2d47084 
the original CL back.  Also fix the test startup script to match
the GCE startup script.
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 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 Dec 2, 2017
@dnardo
Copy link
Contributor Author

dnardo commented Dec 2, 2017

/assign @MrHohn

@MrHohn
Copy link
Member

MrHohn commented Dec 2, 2017

Ref #56727.

@dnardo
Copy link
Contributor Author

dnardo commented Dec 2, 2017

/assign @thockin

@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Dec 2, 2017
@MrHohn
Copy link
Member

MrHohn commented Dec 2, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added 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. 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 Dec 2, 2017
@MrHohn
Copy link
Member

MrHohn commented Dec 2, 2017

/test pull-kubernetes-e2e-gce

@thockin
Copy link
Member

thockin commented Dec 3, 2017

/approve

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dnardo, MrHohn, thockin

Associated issue: 56727

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

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 3, 2017
@dnardo
Copy link
Contributor Author

dnardo commented Dec 4, 2017

/assign @wojtek-t

@MrHohn
Copy link
Member

MrHohn commented Dec 4, 2017

/kind bug
/priority critical-urgent
/sig network

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. sig/network Categorizes an issue or PR as relevant to SIG Network. labels Dec 4, 2017
@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 Dec 4, 2017
@wojtek-t wojtek-t added this to the v1.7 milestone Dec 4, 2017
@dnardo
Copy link
Contributor Author

dnardo commented Dec 4, 2017

@thockin can you apply status/approved-for-milestone

@bowei
Copy link
Member

bowei commented Dec 4, 2017

/status approved-for-milestone

@MrHohn
Copy link
Member

MrHohn commented Dec 5, 2017

/retest

@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 772e9db into kubernetes:release-1.7 Dec 5, 2017
@rohitagarwal003
Copy link
Member

Hi,

A lot of GCE tests on 1.7 seem to have started failing after this:

https://k8s-testgrid.appspot.com/sig-release-1.7-all#gce-alpha-features-release-1.7
https://k8s-testgrid.appspot.com/sig-release-1.7-all#gce-serial-release-1.7
https://k8s-testgrid.appspot.com/sig-release-1.7-all#gce-reboot-release-1.7
https://k8s-testgrid.appspot.com/sig-release-1.7-all#gce-gpu-1.7

and more... (https://k8s-testgrid.appspot.com/sig-release-1.7-all#Summary)

@dnardo Can you please take a look?

@dnardo
Copy link
Contributor Author

dnardo commented Dec 10, 2017

@mindprince I suspect we just aren't passing the "NON_MASQUERADE_CIDR" in the test environment. I'll take a look.

@dnardo
Copy link
Contributor Author

dnardo commented Dec 10, 2017

I believe #56809 would fix this if we cherry pick it back to 1.7 and 1.8

@MrHohn
Copy link
Member

MrHohn commented Dec 11, 2017

I believe #56809 would fix this if we cherry pick it back to 1.7 and 1.8

Humm..The change in #56809 was already included in your previous cherrypicks (e.g. this one).

@wojtek-t
Copy link
Member

Indeed - it seems that it was already part of this PR.

BTW - it seems that it didn't impact GCI tests - it only impacted non-GCI ones, which might simplify debugging.

@dnardo
Copy link
Contributor Author

dnardo commented Dec 11, 2017

@MrHohn @wojtek-t
Are you sure that is in 1.7? I checked 1.7.11 and I don't see any references to NON_MASQUERADE_CIDR in the config-test.sh

@wojtek-t
Copy link
Member

@dnardo - it's not in 1.7.11. But it's in head of 1.7 branch.

@rohitagarwal003
Copy link
Member

@dnardo Any updates here?

@dnardo
Copy link
Contributor Author

dnardo commented Dec 13, 2017

PRs are out for review to fix mainline and 1.7 debian shell scripts. All of these shell scripts should be killed with fire

@MrHohn
Copy link
Member

MrHohn commented Dec 13, 2017

PRs are out for review to fix mainline and 1.7 debian shell scripts.

Ref #57051 and #57157.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@thockin thockin

@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. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/network Categorizes an issue or PR as relevant to SIG Network. 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.
8 participants
@dnardo @MrHohn @thockin @k8s-github-robot @bowei @rohitagarwal003 @wojtek-t @k8s-ci-robot