Merge pull request #56190 from edisonxiang/fixcontrolplaneunittests

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>. fix controlplane unit tests What this PR does / why we need it: when the flexvolumeDirVolumePath is truely existent in the host, ```cmd/kubeadm/app/phases/controlplane``` unit tests will be failed. Fixes #56189 Release note: ```release-note NONE ```

Merge pull request #56190 from edisonxiang/fixcontrolplaneunittests
362e6293 · Kubernetes Submit Queue · GitHub · 53776b5b · 29d42afe · 362e6293
Unverified Commit 362e6293 authored Nov 23, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 23, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

volumes_test.go cmd/kubeadm/app/phases/controlplane/volumes_test.go +9 -0

No files found.
--- a/cmd/kubeadm/app/phases/controlplane/volumes_test.go
+++ b/cmd/kubeadm/app/phases/controlplane/volumes_test.go
@@ -513,6 +513,15 @@ func TestGetHostPathVolumesForTheControlPlane(t *testing.T) {

 	for _, rt := range tests {
 		mounts := getHostPathVolumesForTheControlPlane(rt.cfg)
+
+		// Avoid unit test errors when the flexvolume is mounted
+		if _, ok := mounts.volumes[kubeadmconstants.KubeControllerManager][flexvolumeDirVolumeName]; ok {
+			delete(mounts.volumes[kubeadmconstants.KubeControllerManager], flexvolumeDirVolumeName)
+		}
+		if _, ok := mounts.volumeMounts[kubeadmconstants.KubeControllerManager][flexvolumeDirVolumeName]; ok {
+			delete(mounts.volumeMounts[kubeadmconstants.KubeControllerManager], flexvolumeDirVolumeName)
+		}
+
 		if !reflect.DeepEqual(mounts.volumes, rt.vol) {
 			t.Errorf(
 				"failed getHostPathVolumesForTheControlPlane:\n\texpected: %v\n\t  actual: %v",