Merge pull request #38200 from hongchaodeng/e

Automatic merge from submit-queue (batch tested with PRs 37032, 38119, 38186, 38200, 38139) etcd2: remove unnecessary PrevValue in SetOption ref: https://github.com/kubernetes/kubernetes/issues/37994 Summary: - PrevValue is set in HTTP header, and large value (>1MB) could exceed check limit - We don't need PrevValue indeed since we already use PrevIndex in SetOptions and each PrevIndex corresponds to each PrevValue. I don't really think we need extra tests for this. There is already test for GuaranteedUpdate covering its use cases.

Merge pull request #38200 from hongchaodeng/e
6cfe041b · Kubernetes Submit Queue · GitHub · 224893c5 · 7a0176da · 6cfe041b
Commit 6cfe041b authored Dec 06, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 06, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

etcd_helper.go pkg/storage/etcd/etcd_helper.go +0 -1

No files found.
--- a/pkg/storage/etcd/etcd_helper.go
+++ b/pkg/storage/etcd/etcd_helper.go
@@ -525,7 +525,6 @@ func (h *etcdHelper) GuaranteedUpdate(
 		startTime := time.Now()
 		// Swap origBody with data, if origBody is the latest etcd data.
 		opts := etcd.SetOptions{
-			PrevValue: origBody,
 			PrevIndex: index,
 			TTL:       time.Duration(ttl) * time.Second,
 		}