From d7b8b8302943f04f89d9aaa5b149bcf55b435462 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 | 12 ++++++------ go.mod | 17 ++++++++--------- go.sum | 4 ++++ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 8db777d0..071f36fc 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -128,11 +128,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", @@ -368,19 +368,19 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "816a9b7df678" + "Rev": "5524a3672fbb" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "b1267f8c42b4" + "Rev": "af6325b3a843" }, { "ImportPath": "k8s.io/client-go", - "Rev": "14c42cd304d9" + "Rev": "af0e48646694" }, { "ImportPath": "k8s.io/code-generator", - "Rev": "700b1226c0bd" + "Rev": "fb66f1f7eb3c" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 38cde7a5..879dcd7e 100644 --- a/go.mod +++ b/go.mod @@ -5,10 +5,10 @@ module k8s.io/sample-controller go 1.12 require ( - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/code-generator v0.0.0 + k8s.io/api v0.0.0-20191025225708-5524a3672fbb + k8s.io/apimachinery v0.0.0-20191025225532-af6325b3a843 + k8s.io/client-go v0.0.0-20191025225928-af0e48646694 + k8s.io/code-generator v0.0.0-20191025225349-fb66f1f7eb3c k8s.io/klog v1.0.0 ) @@ -21,9 +21,8 @@ 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/code-generator => ../code-generator - k8s.io/sample-controller => ../sample-controller + k8s.io/api => k8s.io/api v0.0.0-20191025225708-5524a3672fbb + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191025225532-af6325b3a843 + k8s.io/client-go => k8s.io/client-go v0.0.0-20191025225928-af0e48646694 + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191025225349-fb66f1f7eb3c ) diff --git a/go.sum b/go.sum index ef681ead..9eb8b9b6 100644 --- a/go.sum +++ b/go.sum @@ -192,6 +192,10 @@ 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/client-go v0.0.0-20191025225928-af0e48646694/go.mod h1:ZLqcZX6t7degTAe8tELFpWE+ekFiCB7rH8Wc4u320BA= +k8s.io/code-generator v0.0.0-20191025225349-fb66f1f7eb3c/go.mod h1:HtDEU3n5Xo1vbwjXWiJ/lFNb5r6BWBz6aZU1IZTr4eA= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM=