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

Revert "Remove untainting logic." #3050

Merged

Conversation

viteksafronov
Copy link
Contributor

This reverts a part of commit eec47aa.
Restore the logic for untainting old k8s-clusters
#3028

This reverts a part of commit eec47aa.
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 6, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: viteksafronov
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: r2d4

If they are not already assigned, you can assign the PR to them by writing /assign @r2d4 in a comment when ready.

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 6, 2018
@minikube-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@viteksafronov
Copy link
Contributor Author

/assign @dlorenc

@dlorenc
Copy link
Contributor

dlorenc commented Aug 6, 2018

@minikube-bot OK to test

@dlorenc dlorenc merged commit 477ece9 into kubernetes:master Aug 6, 2018
@viteksafronov viteksafronov deleted the restore-untaint-master-for-old-k8s branch September 28, 2018 18:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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.

4 participants