From 012bdcb9264371b7edc0cc518f73a3443bf99a9f Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Sat, 23 Feb 2019 22:36:28 -0700 Subject: [PATCH] Update vendor --- trash.lock | 250 +++++++++--------- vendor.conf | 2 +- vendor/k8s.io/client-go/pkg/version/base.go | 6 +- .../pkg/kubelet/lifecycle/predicate.go | 14 + vendor/k8s.io/kubernetes/pkg/version/base.go | 6 +- 5 files changed, 146 insertions(+), 132 deletions(-) diff --git a/trash.lock b/trash.lock index 54f2145333..62097d5f92 100755 --- a/trash.lock +++ b/trash.lock @@ -155,145 +155,145 @@ import: - package: gopkg.in/yaml.v2 version: v2.2.1 - package: k8s.io/kubernetes - version: v1.13.3-k3s.5 - repo: https://github.com/ibuildthecloud/k3s.git + version: v1.13.3-k3s.6 + repo: https://github.com/rancher/k3s.git transitive: true staging: true +- package: github.com/spf13/pflag + version: v1.0.1 +- package: github.com/euank/go-kmsg-parser + version: v2.0.0 +- package: github.com/fsnotify/fsnotify + version: v1.3.1-1-gf12c6236fe7b5c +- package: github.com/google/btree + version: 7d79101e329e5a3adf994758c578dab82b90c017 +- package: github.com/imdario/mergo + version: v0.3.5 +- package: github.com/prometheus/common + version: 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207 +- package: github.com/shurcooL/sanitized_anchor_name + version: 10ef21a441db47d8b13ebcc5fd2310f636973c77 +- package: github.com/JeffAshton/win_pdh + version: 76bb4ee9f0ab50f77826f2a2ee7fb9d3880d6ec2 +- package: github.com/vishvananda/netlink + version: b2de5d10e38ecce8607e6b438b6d174f389a004e - package: github.com/MakeNowJust/heredoc version: bb23615498cded5e105af4ce27de75b089cbe851 -- package: github.com/prometheus/client_golang - version: v0.8.0-83-ge7e903064f5e9e -- package: github.com/ugorji/go - version: bdcc60b419d136a85cdf2e7cbcac34b3f1cd6e57 - package: vbom.ml/util version: db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 - package: github.com/docker/docker version: docs-v1.12.0-rc4-2016-07-15-9510-ga9fbbdc8dd8794 -- package: github.com/docker/go-units - version: v0.3.1-11-g9e638d38cf6977 -- package: github.com/spf13/pflag - version: v1.0.1 -- package: github.com/robfig/cron - version: v1-53-gdf38d32658d878 -- package: github.com/daviddengcn/go-colortext - version: 511bcaf42ccd42c38aba7427b6673277bf19e2a1 -- package: github.com/evanphx/json-patch - version: v4.0.0-3-g36442dbdb58521 -- package: github.com/mrunalp/fileutils - version: 4ee1cc9a80582a0c75febdd5cfa779ee4361cbca -- package: github.com/JeffAshton/win_pdh - version: 76bb4ee9f0ab50f77826f2a2ee7fb9d3880d6ec2 -- package: github.com/prometheus/procfs - version: 65c1f6f8f0fc1e2185eb9863a3bc751496404259 -- package: github.com/renstrom/dedent - version: v1.0.0-3-g020d11c3b9c0c7 -- package: sigs.k8s.io/yaml - version: v1.1.0 -- package: github.com/mistifyio/go-zfs - version: v2.1.1-5-g1b4ae6fb4e77b0 -- package: github.com/mindprince/gonvml - version: fee913ce8fb235edf54739d259ca0ecc226c7b8a -- package: gopkg.in/square/go-jose.v2 - version: v2.1.6-4-g89060dee6a84df -- package: github.com/inconshreveable/mousetrap - version: v1.0 -- package: github.com/prometheus/common - version: 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207 -- package: github.com/vishvananda/netns - version: be1fbeda19366dea804f00efff2dd73a1642fdcc -- package: github.com/armon/circbuf - version: bbbad097214e2918d8543d5201d12bfd7bca254d -- package: github.com/jteeuwen/go-bindata - version: v3.0.7-72-ga0ff2567cfb709 -- package: github.com/chai2010/gettext-go - version: c6fed771bfd517099caf0f7a961671fa8ed08723 -- package: k8s.io/gengo - version: 51747d6e00da1fc578d5a333a93bb2abcbce7a95 -- package: github.com/karrick/godirwalk - version: v1.7.5 -- package: github.com/prometheus/client_model - version: model-0.0.2-12-gfa8ad6fec33561 -- package: github.com/shurcooL/sanitized_anchor_name - version: 10ef21a441db47d8b13ebcc5fd2310f636973c77 -- package: k8s.io/klog - version: 8139d8cb77af419532b33dfa7dd09fbc5f1d344f -- package: k8s.io/utils - version: 66066c83e385e385ccc3c964b44fd7dcd413d0ed -- package: github.com/Nvveen/Gotty - version: cd527374f1e5bff4938207604a14f2e38a9cf512 -- package: gopkg.in/natefinch/lumberjack.v2 - version: v1.0-16-g20b71e5b60d756 -- package: github.com/euank/go-kmsg-parser - version: v2.0.0 -- package: github.com/mxk/go-flowrate - version: cca7078d478f8520f85629ad7c68962d31ed7682 -- package: github.com/pborman/uuid - version: ca53cad383cad2479bbba7f7a1a05797ec1386e4 -- package: github.com/spf13/cobra - version: v0.0.1-34-gc439c4fa093711 -- package: github.com/cyphar/filepath-securejoin - version: v0.2.1-1-gae69057f2299fb -- package: github.com/hashicorp/golang-lru - version: a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4 -- package: github.com/golang/groupcache - version: 02826c3e79038b59d737d3b1c0a1d937f71a4433 -- package: github.com/docker/libnetwork - version: v0.8.0-dev.2-1265-ga9cd636e378982 -- package: golang.org/x/tools - version: 2382e3994d48b1d22acc2c86bcad0a2aff028e32 -- package: github.com/vishvananda/netlink - version: b2de5d10e38ecce8607e6b438b6d174f389a004e -- package: k8s.io/heapster - version: v1.2.0-beta.1 -- package: github.com/fsnotify/fsnotify - version: v1.3.1-1-gf12c6236fe7b5c -- package: github.com/cloudflare/cfssl - version: 1.3.2-21-g56268a613adfed - package: github.com/ibuildthecloud/kvsql version: c649f12fe5250718e4e024b8b40e7de796ab095e -- package: github.com/imdario/mergo - version: v0.3.5 -- package: github.com/russross/blackfriday - version: v1.4-2-g300106c228d52c -- package: github.com/Azure/go-ansiterm - version: d6e3b3328b783f23731bc4d058875b0371ff8109 -- package: github.com/google/certificate-transparency-go - version: v1.0.21 -- package: github.com/google/cadvisor - version: 91dab6eb91496ed68acbef68b02b34b3392ca754 - repo: https://github.com/ibuildthecloud/cadvisor.git -- package: github.com/google/btree - version: 7d79101e329e5a3adf994758c578dab82b90c017 -- package: github.com/googleapis/gnostic - version: 0c5108395e2debce0d731cf0287ddf7242066aba +- package: github.com/mindprince/gonvml + version: fee913ce8fb235edf54739d259ca0ecc226c7b8a +- package: k8s.io/heapster + version: v1.2.0-beta.1 +- package: github.com/mrunalp/fileutils + version: 4ee1cc9a80582a0c75febdd5cfa779ee4361cbca +- package: github.com/peterbourgon/diskv + version: v2.0.1 +- package: github.com/hashicorp/golang-lru + version: a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4 +- package: github.com/sigma/go-inotify + version: c87b6cf5033d2c6486046f045eeebdc3d910fd38 +- package: github.com/spf13/cobra + version: v0.0.1-34-gc439c4fa093711 +- package: github.com/Nvveen/Gotty + version: cd527374f1e5bff4938207604a14f2e38a9cf512 +- package: github.com/prometheus/client_golang + version: v0.8.0-83-ge7e903064f5e9e +- package: github.com/ugorji/go + version: bdcc60b419d136a85cdf2e7cbcac34b3f1cd6e57 +- package: github.com/docker/go-units + version: v0.3.1-11-g9e638d38cf6977 +- package: github.com/miekg/dns + version: 5d001d020961ae1c184f9f8152fdc73810481677 +- package: github.com/mitchellh/go-wordwrap + version: ad45545899c7b13c020ea92b2072220eefad42b8 +- package: github.com/cyphar/filepath-securejoin + version: v0.2.1-1-gae69057f2299fb +- package: github.com/golang/groupcache + version: 02826c3e79038b59d737d3b1c0a1d937f71a4433 +- package: github.com/container-storage-interface/spec + version: v1.0.0 +- package: github.com/coreos/etcd + version: v3.3.10 +- package: github.com/exponent-io/jsonpath + version: d6023ce2651d8eafb5c75bb0c7167536102ec9f5 +- package: github.com/chai2010/gettext-go + version: c6fed771bfd517099caf0f7a961671fa8ed08723 +- package: github.com/docker/libnetwork + version: v0.8.0-dev.2-1265-ga9cd636e378982 +- package: github.com/gregjones/httpcache + version: 787624de3eb7bd915c329cba748687a3b22666a6 - package: bitbucket.org/ww/goautoneg version: a547fc61f48d567d5b4ec6f8aee5573d8efce11d repo: https://github.com/rancher/goautoneg.git -- package: github.com/coreos/etcd - version: v3.3.10 -- package: github.com/gregjones/httpcache - version: 787624de3eb7bd915c329cba748687a3b22666a6 -- package: github.com/container-storage-interface/spec - version: v1.0.0 -- package: github.com/exponent-io/jsonpath - version: d6023ce2651d8eafb5c75bb0c7167536102ec9f5 -- package: github.com/miekg/dns - version: 5d001d020961ae1c184f9f8152fdc73810481677 -- package: github.com/docker/go-connections - version: v0.3.0 -- package: github.com/sigma/go-inotify - version: c87b6cf5033d2c6486046f045eeebdc3d910fd38 +- package: github.com/daviddengcn/go-colortext + version: 511bcaf42ccd42c38aba7427b6673277bf19e2a1 +- package: k8s.io/klog + version: 8139d8cb77af419532b33dfa7dd09fbc5f1d344f +- package: sigs.k8s.io/yaml + version: v1.1.0 +- package: k8s.io/gengo + version: 51747d6e00da1fc578d5a333a93bb2abcbce7a95 +- package: github.com/googleapis/gnostic + version: 0c5108395e2debce0d731cf0287ddf7242066aba +- package: github.com/renstrom/dedent + version: v1.0.0-3-g020d11c3b9c0c7 +- package: github.com/google/cadvisor + version: 91dab6eb91496ed68acbef68b02b34b3392ca754 + repo: https://github.com/ibuildthecloud/cadvisor.git +- package: github.com/robfig/cron + version: v1-53-gdf38d32658d878 +- package: github.com/russross/blackfriday + version: v1.4-2-g300106c228d52c - package: github.com/jonboulle/clockwork version: 72f9bd7c4e0c2a40055ab3d0f09654f730cce982 -- package: github.com/peterbourgon/diskv - version: v2.0.1 -- package: github.com/coreos/pkg - version: v4 -- package: github.com/fatih/camelcase - version: f6a740d52f961c60348ebb109adde9f4635d7540 -- package: github.com/mitchellh/go-wordwrap - version: ad45545899c7b13c020ea92b2072220eefad42b8 -- package: github.com/mattn/go-shellwords - version: v1.0.3-20-gf8471b0a71ded0 +- package: github.com/mxk/go-flowrate + version: cca7078d478f8520f85629ad7c68962d31ed7682 +- package: github.com/Azure/go-ansiterm + version: d6e3b3328b783f23731bc4d058875b0371ff8109 +- package: github.com/pborman/uuid + version: ca53cad383cad2479bbba7f7a1a05797ec1386e4 +- package: github.com/armon/circbuf + version: bbbad097214e2918d8543d5201d12bfd7bca254d +- package: github.com/cloudflare/cfssl + version: 1.3.2-21-g56268a613adfed +- package: golang.org/x/tools + version: 2382e3994d48b1d22acc2c86bcad0a2aff028e32 +- package: gopkg.in/natefinch/lumberjack.v2 + version: v1.0-16-g20b71e5b60d756 +- package: github.com/mistifyio/go-zfs + version: v2.1.1-5-g1b4ae6fb4e77b0 +- package: github.com/vishvananda/netns + version: be1fbeda19366dea804f00efff2dd73a1642fdcc +- package: github.com/evanphx/json-patch + version: v4.0.0-3-g36442dbdb58521 +- package: github.com/inconshreveable/mousetrap + version: v1.0 - package: github.com/coreos/go-semver version: v0.2.0-9-ge214231b295a8e +- package: github.com/coreos/pkg + version: v4 +- package: github.com/prometheus/procfs + version: 65c1f6f8f0fc1e2185eb9863a3bc751496404259 +- package: github.com/google/certificate-transparency-go + version: v1.0.21 +- package: github.com/prometheus/client_model + version: model-0.0.2-12-gfa8ad6fec33561 +- package: github.com/karrick/godirwalk + version: v1.7.5 +- package: gopkg.in/square/go-jose.v2 + version: v2.1.6-4-g89060dee6a84df +- package: github.com/fatih/camelcase + version: f6a740d52f961c60348ebb109adde9f4635d7540 +- package: github.com/jteeuwen/go-bindata + version: v3.0.7-72-ga0ff2567cfb709 +- package: github.com/mattn/go-shellwords + version: v1.0.3-20-gf8471b0a71ded0 +- package: k8s.io/utils + version: 66066c83e385e385ccc3c964b44fd7dcd413d0ed +- package: github.com/docker/go-connections + version: v0.3.0 diff --git a/vendor.conf b/vendor.conf index 3b29138b22..0698653cd2 100644 --- a/vendor.conf +++ b/vendor.conf @@ -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 diff --git a/vendor/k8s.io/client-go/pkg/version/base.go b/vendor/k8s.io/client-go/pkg/version/base.go index c9e9833811..3b137e30cc 100644 --- a/vendor/k8s.io/client-go/pkg/version/base.go +++ b/vendor/k8s.io/client-go/pkg/version/base.go @@ -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" ) diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/lifecycle/predicate.go b/vendor/k8s.io/kubernetes/pkg/kubelet/lifecycle/predicate.go index df4a32d1ad..67fa7a796c 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/lifecycle/predicate.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/lifecycle/predicate.go @@ -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) diff --git a/vendor/k8s.io/kubernetes/pkg/version/base.go b/vendor/k8s.io/kubernetes/pkg/version/base.go index c9e9833811..3b137e30cc 100644 --- a/vendor/k8s.io/kubernetes/pkg/version/base.go +++ b/vendor/k8s.io/kubernetes/pkg/version/base.go @@ -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" )