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

Remove the temporary fix for pre-1.0 mirror pods #40877

Merged
merged 1 commit into from Feb 4, 2017

Conversation

yujuhong
Copy link
Contributor

@yujuhong yujuhong commented Feb 2, 2017

The fix was introduced to fix #15960 for pre-1.0 pods. It should be safe to remove
this fix now.

@yujuhong yujuhong added the release-note-none Denotes a PR that doesn't merit a release note. label Feb 2, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 2, 2017
@yujuhong yujuhong added the kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. label Feb 2, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@k8s-github-robot k8s-github-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 2, 2017
@lavalamp lavalamp added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Feb 3, 2017
@lavalamp
Copy link
Member

lavalamp commented Feb 3, 2017

/lgtm
/approve

But I think this needs an action required release note on the off chance that someone still has 1.0 kubelets running.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 3, 2017
@yujuhong
Copy link
Contributor Author

yujuhong commented Feb 3, 2017

But I think this needs an action required release note on the off chance that someone still has 1.0 kubelets running.

"Pre-1.0" kubelet.... ;)

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

The following people have approved this PR: lavalamp, 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 Feb 3, 2017
@lavalamp
Copy link
Member

lavalamp commented Feb 4, 2017

hm, the old code says things like, "// TODO: Remove this code after we drop support for v1.0 kubelets."

@k8s-github-robot
Copy link

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

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 40289, 40877, 40879, 39972, 40942)

@k8s-github-robot k8s-github-robot merged commit 6adf3e5 into kubernetes:master Feb 4, 2017
@yujuhong yujuhong deleted the rm_mirror_annotation branch February 8, 2017 00:35
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. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Mirror pods in a delete create loop in version skewed cluster (1.1 master, 1.0 node)
6 participants