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

NetworkPolicy cherry-pick 1.3 #29556

Merged
merged 3 commits into from
Jul 29, 2016
Merged

NetworkPolicy cherry-pick 1.3 #29556

merged 3 commits into from
Jul 29, 2016

Conversation

caseydavenport
Copy link
Member

  • Enable NetworkPolicy by default
  • NetworkPolicy related docs autogen

CC @thockin @fabioy

@caseydavenport caseydavenport mentioned this pull request Jul 25, 2016
Merged
@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. release-note-label-needed labels Jul 25, 2016
@fabioy fabioy 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 DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. release-note-label-needed labels Jul 25, 2016
@fabioy fabioy added this to the v1.3 milestone Jul 25, 2016
@fabioy fabioy added cherrypick-candidate cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Jul 25, 2016
@k8s-github-robot
Copy link

@fabioy
You must link to the test flake issue which caused you to request this manual re-test.
Re-test requests should be in the form of: k8s-bot test this issue: #<number>
Here is the list of open test flakes.

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 29, 2016
@thockin
Copy link
Member

thockin commented Jul 29, 2016

LGTM but it needs a rebase, sorry @caseydavenport

@fabioy fabioy added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 29, 2016
@k8s-github-robot
Copy link

@fabioy
You must link to the test flake issue which caused you to request this manual re-test.
Re-test requests should be in the form of: k8s-bot test this issue: #<number>
Here is the list of open test flakes.

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 29, 2016
@caseydavenport caseydavenport force-pushed the networkpolicy-cherrypick-1.3 branch from d94b6b9 to 877adc9 Compare July 29, 2016 16:29
@thockin
Copy link
Member

thockin commented Jul 29, 2016

/go/src/k8s.io/kubernetes/docs/api-reference is out of date. Please run hack/update-api-reference-docs.sh

/go/src/k8s.io/kubernetes/api/swagger-spec is out of date. Please run hack/update-swagger-spec.sh

@fabioy fabioy added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Jul 29, 2016
@fabioy
Copy link
Contributor

fabioy commented Jul 29, 2016

@caseydavenport Can you fix the issues Tim found and rebase the PR? Thanks.

@caseydavenport caseydavenport force-pushed the networkpolicy-cherrypick-1.3 branch from 877adc9 to 4ce4e48 Compare July 29, 2016 17:48
@caseydavenport
Copy link
Member Author

@fabioy @thockin Yep, sorry about that. Just re-ran the auto-gen so hopefully all is good now.

@fabioy fabioy added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 29, 2016
@k8s-bot
Copy link

k8s-bot commented Jul 29, 2016

GCE e2e build/test passed for commit 4ce4e48.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@fabioy fabioy merged commit 023d589 into kubernetes:release-1.3 Jul 29, 2016
@fabioy
Copy link
Contributor

fabioy commented Jul 29, 2016

Argh, silly Github plugin error. Manually merging.

@k8s-cherrypick-bot
Copy link

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

@k8s-bot
Copy link

k8s-bot commented Jul 29, 2016

GCE e2e build/test passed for commit 4ce4e48.

@caseydavenport caseydavenport deleted the networkpolicy-cherrypick-1.3 branch July 29, 2016 20:04
@caseydavenport caseydavenport mentioned this pull request Aug 1, 2016
Merged
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@fabioy
Merge pull request kubernetes#29556 from caseydavenport/networkpolicy…
eb4f5b7 
…-cherrypick-1.3

NetworkPolicy cherry-pick 1.3
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@fabioy
Merge pull request kubernetes#29556 from caseydavenport/networkpolicy…
4f3af99 
…-cherrypick-1.3

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

@bgrant0607 bgrant0607

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.3
Development

Successfully merging this pull request may close these issues.
8 participants
@caseydavenport @k8s-github-robot @thockin @fabioy @k8s-bot @k8s-cherrypick-bot @googlebot @bgrant0607