mirror of https://github.com/k3s-io/k3s
e1248bcbbc
Automatic merge from submit-queue
Fixed incorrect result of getMinTolerationTime.
For the following case, `getMinTolerationTime` should return one; but it returned -1 ：
1. for tolerations[0], TolerationSeconds is nil, minTolerationTime is not set
2. for tolerations[1], it's TolerationSeconds (1) is bigger than `minTolerationTime`, so minTolerationTime is still -1 which means infinite.
```
+ {
+ tolerations: []v1.Toleration{
+ {
+ TolerationSeconds: nil,
+ },
+ {
+ TolerationSeconds: &one,
+ },
+ },
+ },
```
|
||
|---|---|---|
| .. | ||
| api | ||
| apimachinery/tests | ||
| apis | ||
| auth | ||
| bootstrap/api | ||
| capabilities | ||
| client | ||
| cloudprovider | ||
| controller | ||
| conversion | ||
| credentialprovider | ||
| features | ||
| fieldpath | ||
| fields | ||
| generated | ||
| hyperkube | ||
| kubeapiserver | ||
| kubectl | ||
| kubelet | ||
| kubemark | ||
| labels | ||
| master | ||
| metrics | ||
| printers | ||
| probe | ||
| proxy | ||
| quota | ||
| registry | ||
| routes | ||
| runtime | ||
| security | ||
| securitycontext | ||
| serviceaccount | ||
| ssh | ||
| types | ||
| util | ||
| version | ||
| volume | ||
| watch | ||
| BUILD | ||
| OWNERS | ||