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

Set the NON_MASQUERADE_CIDR to 0/0 by default in GCE/GKE #55178

Merged
merged 1 commit into from
Nov 7, 2017

Conversation

dnardo
Copy link
Contributor

@dnardo dnardo commented Nov 6, 2017

This disables masquerade rules setup by the kubelet. Additionally this adds masquerade rules based on NON_MASQUERADE_CIDR being set to 0/0.

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 #

Special notes for your reviewer:

Release note:

Add masquerading rules by default to GCE/GKE

masquerade rules setup by the kubelet.  Add masquerade rules based
on NON_MASQUERADE_CIDR being set to 0/0.
@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 6, 2017
@dnardo
Copy link
Contributor Author

dnardo commented Nov 6, 2017

/assign @bowei

@dnardo
Copy link
Contributor Author

dnardo commented Nov 6, 2017

/assign @thockin

@dnardo
Copy link
Contributor Author

dnardo commented Nov 6, 2017

/retest

@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 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 Nov 7, 2017
@thockin
Copy link
Member

thockin commented Nov 7, 2017

/lgtm
/approve no-issue

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

[APPROVALNOTIFIER] This PR is APPROVED

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

Associated issue requirement bypassed by: thockin

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 Nov 7, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 53866, 54852, 55178, 55185, 55130). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit ce90b54 into kubernetes:master Nov 7, 2017
k8s-github-robot pushed a commit that referenced this pull request Nov 11, 2017
…-upstream-release-1.8

Automatic merge from submit-queue.

Automated cherry pick of #55178

Cherry pick of #55178 on release-1.8.

#55178: Set the NON_MASQUERADE_CIDR to 0/0 by default in GCE/GKE
k8s-github-robot pushed a commit that referenced this pull request Nov 17, 2017
…-upstream-release-1.7

Automatic merge from submit-queue.

Automated cherry pick of #55178

Cherry pick of #55178 on release-1.7.

#55178: Set the NON_MASQUERADE_CIDR to 0/0 by default in GCE/GKE
k8s-github-robot pushed a commit that referenced this pull request Dec 16, 2017
Automatic merge from submit-queue (batch tested with PRs 56250, 56809, 56812, 56792, 56724). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Set NON_MASQUERADE_CIDR in gce/config-test

**What this PR does / why we need it**:
Ref #56727.

Follow up of #55178. Making test configuration consistent with normal cluster.

**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 #NONE 

**Special notes for your reviewer**:
/assign @dnardo @thockin 

**Release note**:

```release-note
NONE
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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
Development

Successfully merging this pull request may close these issues.

None yet

5 participants