Commit 012bdcb9 authored by Darren Shepherd's avatar Darren Shepherd

Update vendor

parent 828ce5a2
......@@ -9,7 +9,7 @@ package=github.com/opencontainers/runc/libcontainer/nsenter
package=github.com/opencontainers/runc/libcontainer/specconv
package=github.com/opencontainers/runc/contrib/cmd/recvtty
k8s.io/kubernetes v1.13.3-k3s.5 https://github.com/ibuildthecloud/k3s.git transitive=true,staging=true
k8s.io/kubernetes v1.13.3-k3s.6 https://github.com/rancher/k3s.git transitive=true,staging=true
github.com/rancher/norman 816007443daf04e96c7806c2a637dfab8ede9429 https://github.com/ibuildthecloud/norman.git
github.com/coreos/flannel 823afe66b2266bf71f5bec24e6e28b26d70cfc7c https://github.com/ibuildthecloud/flannel.git
......
......@@ -3,8 +3,8 @@ package version
var (
gitMajor = "1"
gitMinor = "13"
gitVersion = "v1.13.3-k3s.5"
gitCommit = "2379cb94d1165598b63c54bcc6d1da2b2f5c3338"
gitVersion = "v1.13.3-k3s.6"
gitCommit = "da4e14f160174f356b1d95198f48439971cc8a85"
gitTreeState = "clean"
buildDate = "2019-02-23T01:17+00:00Z"
buildDate = "2019-02-24T05:21+00:00Z"
)
......@@ -18,6 +18,7 @@ package lifecycle
import (
"fmt"
"time"
"k8s.io/klog"
......@@ -56,6 +57,19 @@ func NewPredicateAdmitHandler(getNodeAnyWayFunc getNodeAnyWayFuncType, admission
}
func (w *predicateAdmitHandler) Admit(attrs *PodAdmitAttributes) PodAdmitResult {
result := w.admit(attrs)
for i := 0; i < 10; i++ {
if result.Admit {
break
}
time.Sleep(time.Second)
result = w.admit(attrs)
}
return result
}
func (w *predicateAdmitHandler) admit(attrs *PodAdmitAttributes) PodAdmitResult {
node, err := w.getNodeAnyWayFunc()
if err != nil {
klog.Errorf("Cannot get Node info: %v", err)
......
......@@ -3,8 +3,8 @@ package version
var (
gitMajor = "1"
gitMinor = "13"
gitVersion = "v1.13.3-k3s.5"
gitCommit = "2379cb94d1165598b63c54bcc6d1da2b2f5c3338"
gitVersion = "v1.13.3-k3s.6"
gitCommit = "da4e14f160174f356b1d95198f48439971cc8a85"
gitTreeState = "clean"
buildDate = "2019-02-23T01:17+00:00Z"
buildDate = "2019-02-24T05:21+00:00Z"
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment