Update to latest kubernetes v1.19.2

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
containerd · Sep 17, 2020 · da4a8ae · da4a8ae
1 parent 210a86c
commit da4a8ae
Show file tree

Hide file tree

Showing 28 changed files with 54 additions and 66 deletions.
diff --git a/vendor.conf b/vendor.conf
@@ -78,15 +78,15 @@ golang.org/x/oauth2                                 858c2ad4c8b6c5d10852cb89079f
 golang.org/x/time                                   555d28b269f0569763d25dbe1a237ae74c6bcc82
 gopkg.in/inf.v0                                     v0.9.1
 gopkg.in/yaml.v2                                    v2.2.8
-k8s.io/api                                          v0.19.0-rc.4
-k8s.io/apiserver                                    v0.19.0-rc.4
-k8s.io/apimachinery                                 v0.19.0-rc.4
-k8s.io/client-go                                    v0.19.0-rc.4
-k8s.io/component-base                               v0.19.0-rc.4
-k8s.io/cri-api                                      v0.19.0-rc.4
+k8s.io/api                                          v0.19.2
+k8s.io/apiserver                                    v0.19.2
+k8s.io/apimachinery                                 v0.19.2
+k8s.io/client-go                                    v0.19.2
+k8s.io/component-base                               v0.19.2
+k8s.io/cri-api                                      v0.19.2
 k8s.io/klog/v2                                      v2.2.0
-k8s.io/utils                                        2df71ebbae66f39338aed4cd0bb82d2212ee33cc
-sigs.k8s.io/structured-merge-diff/v3                v3.0.0
+k8s.io/utils                                        d5654de09c73da55eb19ae4ab4f734f7a61747a6
+sigs.k8s.io/structured-merge-diff/v4                v4.0.1
 sigs.k8s.io/yaml                                    v1.2.0
 
 # cni dependencies

diff --git a/vendor/k8s.io/api/go.mod b/vendor/k8s.io/api/go.mod
diff --git a/vendor/k8s.io/apimachinery/go.mod b/vendor/k8s.io/apimachinery/go.mod
diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/converter.go b/vendor/k8s.io/apimachinery/pkg/runtime/converter.go
diff --git a/vendor/k8s.io/apimachinery/pkg/util/net/http.go b/vendor/k8s.io/apimachinery/pkg/util/net/http.go
diff --git a/vendor/k8s.io/apimachinery/pkg/util/net/util.go b/vendor/k8s.io/apimachinery/pkg/util/net/util.go
diff --git a/vendor/k8s.io/apiserver/go.mod b/vendor/k8s.io/apiserver/go.mod
diff --git a/vendor/k8s.io/client-go/go.mod b/vendor/k8s.io/client-go/go.mod
diff --git a/vendor/k8s.io/component-base/go.mod b/vendor/k8s.io/component-base/go.mod
diff --git a/...s.k8s.io/structured-merge-diff/v3/LICENSE → ...s.k8s.io/structured-merge-diff/v4/LICENSE b/...s.k8s.io/structured-merge-diff/v3/LICENSE → ...s.k8s.io/structured-merge-diff/v4/LICENSE
diff --git a/...k8s.io/structured-merge-diff/v3/README.md → ...k8s.io/structured-merge-diff/v4/README.md b/...k8s.io/structured-merge-diff/v3/README.md → ...k8s.io/structured-merge-diff/v4/README.md
diff --git a/...gs.k8s.io/structured-merge-diff/v3/go.mod → ...gs.k8s.io/structured-merge-diff/v4/go.mod b/...gs.k8s.io/structured-merge-diff/v3/go.mod → ...gs.k8s.io/structured-merge-diff/v4/go.mod
diff --git a/...ructured-merge-diff/v3/value/allocator.go → ...ructured-merge-diff/v4/value/allocator.go b/...ructured-merge-diff/v3/value/allocator.go → ...ructured-merge-diff/v4/value/allocator.go
diff --git a/....io/structured-merge-diff/v3/value/doc.go → ....io/structured-merge-diff/v4/value/doc.go b/....io/structured-merge-diff/v3/value/doc.go → ....io/structured-merge-diff/v4/value/doc.go
diff --git a/.../structured-merge-diff/v3/value/fields.go → .../structured-merge-diff/v4/value/fields.go b/.../structured-merge-diff/v3/value/fields.go → .../structured-merge-diff/v4/value/fields.go
diff --git a/...ctured-merge-diff/v3/value/jsontagutil.go → ...ctured-merge-diff/v4/value/jsontagutil.go b/...ctured-merge-diff/v3/value/jsontagutil.go → ...ctured-merge-diff/v4/value/jsontagutil.go
diff --git a/...io/structured-merge-diff/v3/value/list.go → ...io/structured-merge-diff/v4/value/list.go b/...io/structured-merge-diff/v3/value/list.go → ...io/structured-merge-diff/v4/value/list.go
diff --git a/...ctured-merge-diff/v3/value/listreflect.go → ...ctured-merge-diff/v4/value/listreflect.go b/...ctured-merge-diff/v3/value/listreflect.go → ...ctured-merge-diff/v4/value/listreflect.go
diff --git a/...d-merge-diff/v3/value/listunstructured.go → ...d-merge-diff/v4/value/listunstructured.go b/...d-merge-diff/v3/value/listunstructured.go → ...d-merge-diff/v4/value/listunstructured.go
diff --git a/....io/structured-merge-diff/v3/value/map.go → ....io/structured-merge-diff/v4/value/map.go b/....io/structured-merge-diff/v3/value/map.go → ....io/structured-merge-diff/v4/value/map.go
diff --git a/...uctured-merge-diff/v3/value/mapreflect.go → ...uctured-merge-diff/v4/value/mapreflect.go b/...uctured-merge-diff/v3/value/mapreflect.go → ...uctured-merge-diff/v4/value/mapreflect.go
diff --git a/...ed-merge-diff/v3/value/mapunstructured.go → ...ed-merge-diff/v4/value/mapunstructured.go b/...ed-merge-diff/v3/value/mapunstructured.go → ...ed-merge-diff/v4/value/mapunstructured.go
diff --git a/...tured-merge-diff/v3/value/reflectcache.go → ...tured-merge-diff/v4/value/reflectcache.go b/...tured-merge-diff/v3/value/reflectcache.go → ...tured-merge-diff/v4/value/reflectcache.go
diff --git a/.../structured-merge-diff/v3/value/scalar.go → .../structured-merge-diff/v4/value/scalar.go b/.../structured-merge-diff/v3/value/scalar.go → .../structured-merge-diff/v4/value/scalar.go
diff --git a/...ured-merge-diff/v3/value/structreflect.go → ...ured-merge-diff/v4/value/structreflect.go b/...ured-merge-diff/v3/value/structreflect.go → ...ured-merge-diff/v4/value/structreflect.go
diff --git a/...o/structured-merge-diff/v3/value/value.go → ...o/structured-merge-diff/v4/value/value.go b/...o/structured-merge-diff/v3/value/value.go → ...o/structured-merge-diff/v4/value/value.go
diff --git a/...tured-merge-diff/v3/value/valuereflect.go → ...tured-merge-diff/v4/value/valuereflect.go b/...tured-merge-diff/v3/value/valuereflect.go → ...tured-merge-diff/v4/value/valuereflect.go
diff --git a/...-merge-diff/v3/value/valueunstructured.go → ...-merge-diff/v4/value/valueunstructured.go b/...-merge-diff/v3/value/valueunstructured.go → ...-merge-diff/v4/value/valueunstructured.go