From 32f16d2cc286d4b093b3df7da0f3e50baaed28ae Mon Sep 17 00:00:00 2001
From: Andrew Rynhard <andrew@andrewrynhard.com>
Date: Tue, 14 Nov 2017 14:35:04 -0800
Subject: [PATCH] Don't test flexvolume-dir creation

---
 .../app/phases/controlplane/volumes_test.go   | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/cmd/kubeadm/app/phases/controlplane/volumes_test.go b/cmd/kubeadm/app/phases/controlplane/volumes_test.go
index e0032bdafa0..b2cdacadbaa 100644
--- a/cmd/kubeadm/app/phases/controlplane/volumes_test.go
+++ b/cmd/kubeadm/app/phases/controlplane/volumes_test.go
@@ -306,15 +306,6 @@ func TestGetHostPathVolumesForTheControlPlane(t *testing.T) {
 			},
 		},
 	}
-	volMap[kubeadmconstants.KubeControllerManager]["flexvolume-dir"] = v1.Volume{
-		Name: "flexvolume-dir",
-		VolumeSource: v1.VolumeSource{
-			HostPath: &v1.HostPathVolumeSource{
-				Path: "/usr/libexec/kubernetes/kubelet-plugins/volume/exec",
-				Type: &hostPathDirectoryOrCreate,
-			},
-		},
-	}
 	volMap[kubeadmconstants.KubeScheduler] = map[string]v1.Volume{}
 	volMap[kubeadmconstants.KubeScheduler]["kubeconfig"] = v1.Volume{
 		Name: "kubeconfig",
@@ -353,11 +344,6 @@ func TestGetHostPathVolumesForTheControlPlane(t *testing.T) {
 		MountPath: "/etc/kubernetes/controller-manager.conf",
 		ReadOnly:  true,
 	}
-	volMountMap[kubeadmconstants.KubeControllerManager]["flexvolume-dir"] = v1.VolumeMount{
-		Name:      "flexvolume-dir",
-		MountPath: "/usr/libexec/kubernetes/kubelet-plugins/volume/exec",
-		ReadOnly:  false,
-	}
 	volMountMap[kubeadmconstants.KubeScheduler] = map[string]v1.VolumeMount{}
 	volMountMap[kubeadmconstants.KubeScheduler]["kubeconfig"] = v1.VolumeMount{
 		Name:      "kubeconfig",
@@ -431,15 +417,6 @@ func TestGetHostPathVolumesForTheControlPlane(t *testing.T) {
 			},
 		},
 	}
-	volMap2[kubeadmconstants.KubeControllerManager]["flexvolume-dir"] = v1.Volume{
-		Name: "flexvolume-dir",
-		VolumeSource: v1.VolumeSource{
-			HostPath: &v1.HostPathVolumeSource{
-				Path: "/usr/libexec/kubernetes/kubelet-plugins/volume/exec",
-				Type: &hostPathDirectoryOrCreate,
-			},
-		},
-	}
 	volMap2[kubeadmconstants.KubeScheduler] = map[string]v1.Volume{}
 	volMap2[kubeadmconstants.KubeScheduler]["kubeconfig"] = v1.Volume{
 		Name: "kubeconfig",
@@ -488,11 +465,6 @@ func TestGetHostPathVolumesForTheControlPlane(t *testing.T) {
 		MountPath: "/etc/kubernetes/controller-manager.conf",
 		ReadOnly:  true,
 	}
-	volMountMap2[kubeadmconstants.KubeControllerManager]["flexvolume-dir"] = v1.VolumeMount{
-		Name:      "flexvolume-dir",
-		MountPath: "/usr/libexec/kubernetes/kubelet-plugins/volume/exec",
-		ReadOnly:  false,
-	}
 	volMountMap2[kubeadmconstants.KubeScheduler] = map[string]v1.VolumeMount{}
 	volMountMap2[kubeadmconstants.KubeScheduler]["kubeconfig"] = v1.VolumeMount{
 		Name:      "kubeconfig",