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

Do not set CNI in cases where there is a private master and network policy provider is set. #48004

Merged
merged 1 commit into from
Jun 28, 2017
Merged

Do not set CNI in cases where there is a private master and network policy provider is set. #48004

merged 1 commit into from
Jun 28, 2017

Conversation

dnardo
Copy link
Contributor

@dnardo dnardo commented Jun 23, 2017 •
edited
Loading

What this PR does / why we need it:

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

Special notes for your reviewer:

Release note:

In GCE and in a "private master" setup, do not set the network-plugin provider to CNI by default if a network policy provider is given.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 23, 2017
@dnardo
Copy link
Contributor Author

dnardo commented Jun 23, 2017

/assign @dchen1107

@dnardo
Copy link
Contributor Author

dnardo commented Jun 23, 2017

/assign @caseydavenport

@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels Jun 23, 2017
@dnardo dnardo changed the title Do not set CNI on the master if in GKE and the MASTER and network policy provider is set. Do not set CNI in cases where there is a private master and network policy provider is set. Jun 24, 2017
@dnardo
Copy link
Contributor Author

dnardo commented Jun 26, 2017

ping @dchen1107

@k8s-github-robot k8s-github-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Jun 26, 2017
@caseydavenport
Copy link
Member

@dnardo where is the KUBERNETES_PRIVATE_MASTER variable defined?

Do we need to add an entry here? https://github.com/dnardo/kubernetes/blob/00b62df55483a8addb71af69db5ca413ac5f9863/cluster/common.sh#L586

@caseydavenport
Copy link
Member

/lgtm

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

/lgtm

This is purely GKE related feature, not introducing the risk the OSS K8S release.

@dchen1107 dchen1107 added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherrypick-candidate labels Jun 27, 2017
@dchen1107
Copy link
Member

@dnardo Please create a cherrypick pr for 1.7 release. Thanks!

@dchen1107 dchen1107 added this to the v1.7 milestone Jun 27, 2017
@dchen1107
Copy link
Member

/approve no-issue

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: caseydavenport, dchen1107, dnardo

Associated issue requirement bypassed by: dchen1107

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 Jun 28, 2017
@cmluciano
Copy link

/retest

federation build rbac rule errors

@dnardo
Copy link
Contributor Author

dnardo commented Jun 28, 2017

/retest

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 48004, 48205, 48130, 48207)

@k8s-github-robot k8s-github-robot merged commit 63d4af4 into kubernetes:master Jun 28, 2017
@dnardo dnardo mentioned this pull request Jun 28, 2017
Merged
caesarxuchao added a commit that referenced this pull request Jun 29, 2017
@caesarxuchao
Merge pull request #48218 from dnardo/automated-cherry-pick-of-#48004…
d420643 
…-upstream-release-1.7

Automated cherry pick of #48004
@k8s-cherrypick-bot
Copy link

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

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

@caseydavenport caseydavenport

@dchen1107 dchen1107

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
@dnardo @caseydavenport @dchen1107 @k8s-github-robot @cmluciano @k8s-cherrypick-bot @k8s-ci-robot