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

Remove the deprecated --enable-cri flag #45194

Merged
merged 1 commit into from
May 11, 2017
Merged

Remove the deprecated --enable-cri flag #45194

merged 1 commit into from
May 11, 2017

Conversation

yujuhong
Copy link
Contributor

@yujuhong yujuhong commented May 1, 2017

Except for rkt, CRI is the default and only integration point for
container runtimes.

Remove the deprecated `--enable-cri` flag. CRI is now the default, 
and the only way to integrate with kubelet for the container runtimes.

@yujuhong yujuhong added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label May 1, 2017
@yujuhong yujuhong added this to the v1.7 milestone May 1, 2017
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 1, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@k8s-github-robot k8s-github-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 1, 2017
@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 1, 2017
@yujuhong
Copy link
Contributor Author

yujuhong commented May 1, 2017

/cc @kubernetes/sig-node-pr-reviews

@k8s-ci-robot k8s-ci-robot added the sig/node Categorizes an issue or PR as relevant to SIG Node. label May 1, 2017
@yujuhong yujuhong mentioned this pull request May 1, 2017
Closed
3 tasks
@feiskyer
Copy link
Member

feiskyer commented May 2, 2017

LGTM

@yujuhong
Copy link
Contributor Author

yujuhong commented May 3, 2017

@dchen1107 ping!

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 4, 2017
@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 4, 2017
@yujuhong
Copy link
Contributor Author

yujuhong commented May 4, 2017

@k8s-bot verify test this

@dchen1107
Copy link
Member

/lgtm

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dchen1107, yujuhong

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 May 10, 2017
@yujuhong yujuhong added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 10, 2017
@yujuhong
Copy link
Contributor Author

Applied lgtm manually based on #45194 (comment)
Don't know why the bot is slow.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 10, 2017
@yujuhong
Remove the deprecated --enable-cri flag
daa329c 
Except for rkt, CRI is the default and only integration point for
container runtimes.
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 10, 2017
@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 10, 2017
@yujuhong yujuhong added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 10, 2017
@yujuhong
Copy link
Contributor Author

@k8s-bot bazel test this

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented May 10, 2017 •
edited
Loading

@yujuhong: The following test(s) failed:

Test name Commit Details Rerun command
pull-kubernetes-cross daa329c link @k8s-bot pull-kubernetes-cross test this

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.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 1f3b158 into kubernetes:master May 11, 2017
@yujuhong yujuhong deleted the rm-cri-flag branch May 19, 2017 16:56
@ghost ghost mentioned this pull request Sep 20, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@dchen1107 dchen1107

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. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API 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. sig/node Categorizes an issue or PR as relevant to SIG Node. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.
6 participants
@yujuhong @k8s-reviewable @feiskyer @dchen1107 @k8s-github-robot @k8s-ci-robot