From af0e48646694c57cc548321b1c37abd0d8c7c7c7 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 25 Oct 2019 08:29:39 -0700 Subject: [PATCH] Merge pull request #83987 from wenjiaswe/etcd_client_3_4_2 Update etcd client to v3.4.3 in k8s v1.17 Kubernetes-commit: 09f453ff8322979ed5a7611bc2e5528506c1fc7f --- Godeps/Godeps.json | 8 ++++---- go.mod | 9 ++++----- go.sum | 2 ++ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 8e88ffcc..017eb3e5 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -124,11 +124,11 @@ }, { "ImportPath": "github.com/golang/protobuf", - "Rev": "v1.3.1" + "Rev": "v1.3.2" }, { "ImportPath": "github.com/google/btree", - "Rev": "4030bb1f1f0c" + "Rev": "v1.0.0" }, { "ImportPath": "github.com/google/go-cmp", @@ -344,11 +344,11 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "4cb0a757333c" + "Rev": "5524a3672fbb" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "62ce3d1e6a82" + "Rev": "af6325b3a843" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 293a2ebc..8cad1c20 100644 --- a/go.mod +++ b/go.mod @@ -28,8 +28,8 @@ require ( golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c google.golang.org/appengine v1.5.0 // indirect - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 + k8s.io/api v0.0.0-20191025225708-5524a3672fbb + k8s.io/apimachinery v0.0.0-20191025225532-af6325b3a843 k8s.io/klog v1.0.0 k8s.io/utils v0.0.0-20191010214722-8d271d903fe4 sigs.k8s.io/yaml v1.1.0 @@ -44,7 +44,6 @@ replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go + k8s.io/api => k8s.io/api v0.0.0-20191025225708-5524a3672fbb + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191025225532-af6325b3a843 ) diff --git a/go.sum b/go.sum index cbe6ccf2..bd688ab7 100644 --- a/go.sum +++ b/go.sum @@ -174,6 +174,8 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +k8s.io/api v0.0.0-20191025225708-5524a3672fbb/go.mod h1:NMIXwlJTrA+pXie6lv562GUPkluJ4oRGzQfqWBLaceY= +k8s.io/apimachinery v0.0.0-20191025225532-af6325b3a843/go.mod h1:gA1T9z4LIup7PIegBwxkF2UYXUNVKhOAPvQWWnAc34k= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=