Merge pull request #708 from erikwilson/vendor-v1.14.5-k3s.1

Update k8s to v1.14.5-k3s.1
k3s-io · Aug 5, 2019 · f867995 · f867995
2 parents c170115 + 5d88cc7
commit f867995
Show file tree

Hide file tree

Showing 10 changed files with 180 additions and 84 deletions.
diff --git a/trash.lock b/trash.lock
@@ -239,7 +239,7 @@ import:
 - package: github.com/rancher/wrangler-api
   version: v0.1.4
 - package: github.com/robfig/cron
-  version: v1-53-gdf38d32658d878
+  version: v1.0.0-53-gdf38d32658d878
 - package: github.com/rootless-containers/rootlesskit
   version: v0.4.1
 - package: github.com/russross/blackfriday
@@ -316,7 +316,7 @@ import:
 - package: k8s.io/klog
   version: v0.2.0-14-g8e90cee79f8237
 - package: k8s.io/kubernetes
-  version: v1.14.4-k3s.1
+  version: v1.14.5-k3s.1
   repo: https://github.com/rancher/k3s.git
   transitive: true
   staging: true

diff --git 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.14.4-k3s.1                             https://github.com/rancher/k3s.git                transitive=true,staging=true
+k8s.io/kubernetes                   v1.14.5-k3s.1                             https://github.com/rancher/k3s.git                transitive=true,staging=true
 
 github.com/rancher/wrangler         7737c167e16514a38229bc64c839cee8cd14e6d3
 github.com/rancher/wrangler-api     v0.1.4

diff --git a/vendor/k8s.io/apiextensions-apiserver/pkg/apiserver/BUILD b/vendor/k8s.io/apiextensions-apiserver/pkg/apiserver/BUILD
diff --git a/vendor/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go b/vendor/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_handler.go
diff --git a/vendor/k8s.io/client-go/pkg/version/base.go b/vendor/k8s.io/client-go/pkg/version/base.go
diff --git a/vendor/k8s.io/kubernetes/CHANGELOG-1.14.md b/vendor/k8s.io/kubernetes/CHANGELOG-1.14.md
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/cp/BUILD b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/cp/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/cp/cp.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/cp/cp.go
diff --git a/vendor/k8s.io/kubernetes/pkg/version/base.go b/vendor/k8s.io/kubernetes/pkg/version/base.go
diff --git a/vendor/k8s.io/kubernetes/vendor.conf b/vendor/k8s.io/kubernetes/vendor.conf