Update etcd client to 3.3.9

CharlyF · Oct 8, 2018 · 4263c75 · 4263c75
1 parent 5d0c19c
commit 4263c75
Show file tree

Hide file tree

Showing 432 changed files with 44,758 additions and 44,250 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/LICENSES b/Godeps/LICENSES
diff --git a/cluster/images/etcd/migrate/rollback_v2.go b/cluster/images/etcd/migrate/rollback_v2.go
@@ -314,12 +314,33 @@ func toTTLOptions(r *pb.Request) store.TTLOptionSet {
 }
 
 func applyRequest(r *pb.Request, applyV2 etcdserver.ApplierV2) {
+	// TODO: find a sane way to perform this cast or avoid it in the first place
+	reqV2 := &etcdserver.RequestV2{
+		ID:               r.ID,
+		Method:           r.Method,
+		Path:             r.Path,
+		Val:              r.Val,
+		Dir:              r.Dir,
+		PrevValue:        r.PrevValue,
+		PrevIndex:        r.PrevIndex,
+		PrevExist:        r.PrevExist,
+		Expiration:       r.Expiration,
+		Wait:             r.Wait,
+		Since:            r.Since,
+		Recursive:        r.Recursive,
+		Sorted:           r.Sorted,
+		Quorum:           r.Quorum,
+		Time:             r.Time,
+		Stream:           r.Stream,
+		Refresh:          r.Refresh,
+		XXX_unrecognized: r.XXX_unrecognized,
+	}
 	toTTLOptions(r)
 	switch r.Method {
 	case "PUT":
-		applyV2.Put(r)
+		applyV2.Put(reqV2)
 	case "DELETE":
-		applyV2.Delete(r)
+		applyV2.Delete(reqV2)
 	case "POST", "QGET", "SYNC":
 		return
 	default:

diff --git a/hack/.golint_failures b/hack/.golint_failures
@@ -198,7 +198,6 @@ pkg/kubelet
 pkg/kubelet/apis
 pkg/kubelet/apis/config
 pkg/kubelet/apis/config/v1beta1
-pkg/kubelet/apis/cri/runtime/v1alpha2
 pkg/kubelet/apis/cri/testing
 pkg/kubelet/apis/deviceplugin/v1alpha
 pkg/kubelet/apis/deviceplugin/v1beta1
@@ -253,8 +252,6 @@ pkg/kubelet/types
 pkg/kubelet/util
 pkg/kubelet/util/cache
 pkg/kubelet/util/pluginwatcher
-pkg/kubelet/util/pluginwatcher/example_plugin_apis/v1beta1
-pkg/kubelet/util/pluginwatcher/example_plugin_apis/v1beta2
 pkg/kubelet/util/queue
 pkg/kubelet/util/sliceutils
 pkg/kubemark
@@ -621,7 +618,6 @@ staging/src/k8s.io/apiserver/pkg/storage/storagebackend
 staging/src/k8s.io/apiserver/pkg/storage/testing
 staging/src/k8s.io/apiserver/pkg/storage/tests
 staging/src/k8s.io/apiserver/pkg/storage/value
-staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1
 staging/src/k8s.io/apiserver/pkg/util/feature
 staging/src/k8s.io/apiserver/pkg/util/flag
 staging/src/k8s.io/apiserver/pkg/util/proxy

diff --git a/hack/verify-pkg-names.sh b/hack/verify-pkg-names.sh
@@ -26,7 +26,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 kube::golang::verify_go_version
 
 cd "${KUBE_ROOT}"
-if git --no-pager grep -E $'^(import |\t)[a-z]+[A-Z_][a-zA-Z]* "[^"]+"$' -- '**/*.go' ':(exclude)vendor/*'; then
+if git --no-pager grep -E $'^(import |\t)[a-z]+[A-Z_][a-zA-Z]* "[^"]+"$' -- '**/*.go' ':(exclude)vendor/*' ':(exclude)**.*.pb.go'; then
   echo "!!! Some package aliases break go conventions."
   echo "To fix these errors, do not use capitalized or underlined characters"
   echo "in pkg aliases. Refer to https://blog.golang.org/package-names for more info."