k3s/plugin/pkg
Kubernetes Submit Queue e3e44b77ff Merge pull request #42964 from k82cn/update_defalt_toleration_sec
Automatic merge from submit-queue (batch tested with PRs 44084, 42964)

Updated AddOrUpdateTolerationInPod to return bool only.

Updated AddOrUpdateTolerationInPod to return bool only, as there's no case to generate error (the error was used for annotation, it'll not return error after moving to field); and also update admission & daemonset accordingly.
2017-04-05 20:45:20 -07:00
..
admission Merge pull request #42964 from k82cn/update_defalt_toleration_sec 2017-04-05 20:45:20 -07:00
auth Merge pull request #43034 from enisoc/statefulset-patch 2017-03-14 11:44:37 -07:00
scheduler Merge pull request #43885 from zhangxiaoyu-zidif/master 2017-04-02 17:17:26 -07:00