Merge pull request #57812 from ScorpioCPH/double-check-set-kubelet-config

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. [Alpha: DynamicKubeletConfig] Double check before setKubeletConfiguration **What this PR does / why we need it**: Double check the `newCfg` is not equal to the `oldCfg` before we call `setKubeletConfiguration(newCfg)` in `tempSetCurrentKubeletConfig()`. **Which issue(s) this PR fixes**: Fixes https://github.com/kubernetes/kubernetes/issues/57701 **Special notes for your reviewer**: /area kubelet /sig node /assign @mtaufen /cc @vishh @jiayingz @derekwaynecarr @dchen1107 @liggitt PTAL, Thanks! **Release note**: ```release-note NONE ```

Merge pull request #57812 from ScorpioCPH/double-check-set-kubelet-config
a97ce942 · Kubernetes Submit Queue · GitHub · 1a817b15 · 6cf81916 · a97ce942
Unverified Commit a97ce942 authored Jan 12, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 12, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

util.go test/e2e_node/util.go +4 -0

No files found.
--- a/test/e2e_node/util.go
+++ b/test/e2e_node/util.go
@@ -109,6 +109,10 @@ func tempSetCurrentKubeletConfig(f *framework.Framework, updateFunction func(ini
 		framework.ExpectNoError(err)
 		newCfg := oldCfg.DeepCopy()
 		updateFunction(newCfg)
+		if reflect.DeepEqual(*newCfg, *oldCfg) {
+			return
+		}
 		framework.ExpectNoError(setKubeletConfiguration(f, newCfg))
 	})
 	AfterEach(func() {