Merge pull request #1413 from thaJeztah/update_kubernetes

vendor: update kubernetes to v1.18.0-beta.1

integration/main_test.go

@@ -21,7 +21,6 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"net"
 	"os"
 	"os/exec"
 	"strconv"
@@ -353,13 +352,7 @@ func RawRuntimeClient() (runtime.RuntimeServiceClient, error) {
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
-	conn, err := grpc.DialContext(ctx, addr, grpc.WithInsecure(), grpc.WithContextDialer(
-		func(ctx context.Context, addr string) (net.Conn, error) {
-			if deadline, ok := ctx.Deadline(); ok {
-				return dialer(addr, time.Until(deadline))
-			}
-			return dialer(addr, 0)
-		}))
+	conn, err := grpc.DialContext(ctx, addr, grpc.WithInsecure(), grpc.WithContextDialer(dialer))
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to connect cri endpoint")
 	}

vendor.conf

@@ -62,27 +62,28 @@ github.com/cilium/ebpf                              60c3aa43f488292fe2ee50fb8b83
 github.com/davecgh/go-spew                          8991bc29aa16c548c550c7ff78260e27b9ab7c73 # v1.1.1
 github.com/docker/spdystream                        449fdfce4d962303d702fec724ef0ad181c92528
 github.com/emicklei/go-restful                      b993709ae1a4f6dd19cfa475232614441b11c9d5 # v2.9.5
-github.com/google/gofuzz                            f140a6486e521aad38f5917de355cbf147cc0496 # v1.0.0
+github.com/google/gofuzz                            db92cf7ae75e4a7a28abc005addab2b394362888 # v1.1.0
 github.com/json-iterator/go                         03217c3e97663914aec3faafde50d081f197a0a2 # v1.1.8
 github.com/modern-go/concurrent                     bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 # 1.0.3
 github.com/modern-go/reflect2                       4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd # 1.0.1
 github.com/pmezard/go-difflib                       792786c7400a136282c1664665ae0a8db921c6c2 # v1.0.0
 github.com/seccomp/libseccomp-golang                689e3c1541a84461afc49c1c87352a6cedf72e9c # v0.9.1
 github.com/stretchr/testify                         221dbe5ed46703ee255b1da0dec05086f5035f62 # v1.4.0
-golang.org/x/crypto                                 1d94cc7ab1c630336ab82ccb9c9cda72a875c382
+golang.org/x/crypto                                 bac4c82f69751a6dd76e702d54b3ceb88adab236
 golang.org/x/oauth2                                 0f29369cfe4552d0e4bcddc57cc75f4d7e672a33
 golang.org/x/time                                   9d24e82272b4f38b78bc8cff74fa936d31ccd8ef
 gopkg.in/inf.v0                                     d2d2541c53f18d2a059457998ce2876cc8e67cbf # v0.9.1
 gopkg.in/yaml.v2                                    53403b58ad1b561927d19068c655246f2db79d48 # v2.2.8
-k8s.io/api                                          0952862eca9e889f5aba1dd697ce331d7b126413 # v0.18.0-alpha.1
-k8s.io/apimachinery                                 0ee8b4573e3aecbab8ba0d539f919aa7c53365b2 # v0.18.0-alpha.1
-k8s.io/apiserver                                    ade7e88e6a1d51246811ce11e80c2c04b19b8e1e # v0.18.0-alpha.1
-k8s.io/client-go                                    161ce6706f89eb5d4b15829172b121fed995fa41 # v0.18.0-alpha.1
-k8s.io/cri-api                                      cb37f80103f4d88d4b0cc29542ee6fcfd7c1aa89 # v0.18.0-alpha.1
+k8s.io/api                                          e6bc7324d7efd1c8ab0e68dd8162a2b500b0ce3b # v0.18.0-beta.1
+k8s.io/apimachinery                                 2373d029717c4d169463414a6127cd1d0d12680e # v0.18.0-beta.1
+k8s.io/apiserver                                    9af6eefd238b73bb688c429c32d113d04eeea3a8 # v0.18.0-beta.1
+k8s.io/client-go                                    33a99c0dca04e5e335442262f93df4c3faab201b # v0.18.0-beta.1
+k8s.io/cri-api                                      3d1680d8d202aa12c5dc5689170c3c03a488d35b # v0.18.0-beta.1
 k8s.io/klog                                         2ca9ad30301bf30a8a6e0fa2110db6b8df699a91 # v1.0.0
-k8s.io/kubernetes                                   ac4079a5cc22ced66c868f6fd26f8e2497765e51 # v1.18.0-alpha.1
-k8s.io/utils                                        e782cd3c129fc98ee807f3c889c0f26eb7c9daf5
-sigs.k8s.io/yaml                                    fd68e9863619f6ec2fdd8625fe1f02e7c877e480 # v1.1.0
+k8s.io/kubernetes                                   f2d7577e31829664899f1b8e3d3a73de8c5f4029 # v1.18.0-beta.1
+k8s.io/utils                                        5f6fbceb4c31d35291b2de756aeaae2ddeee3e92
+sigs.k8s.io/structured-merge-diff/v3                877aee05330847a873a1a8998b40e12a1e0fde25 # v3.0.0
+sigs.k8s.io/yaml                                    9fc95527decd95bb9d28cc2eab08179b2d0f6971 # v1.2.0
 
 # cni dependencies
 github.com/containerd/go-cni                        0d360c50b10b350b6bb23863fd4dfb1c232b01c9