Merge pull request kubernetes#31993 from dagnello/release-1.3_vSphere…

…BugFixes Automatic merge from submit-queue Back porting critical vSphere bug fixes to release 1.3 vSphere cloud provider plugin was first introduced in Kubernetes 1.3.0. The two PRs listed below contain critical volume attach/detach related fixes. Without these fixes, vSphere in 1.3 lacks the ability to consistently attach/detach volumes correctly especially in a busy cluster. These changes only affect the vSphere cloud provider. - kubernetes#29172 - kubernetes#30535
shyamjvs · Sep 12, 2016 · 3d2bbff · 3d2bbff
2 parents 7642b80 + 6349802
commit 3d2bbff
Show file tree

Hide file tree

Showing 36 changed files with 1,444 additions and 441 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/cmd/kube-controller-manager/app/plugins.go b/cmd/kube-controller-manager/app/plugins.go
@@ -59,6 +59,7 @@ func ProbeAttachableVolumePlugins(config componentconfig.VolumeConfiguration) []
 	allPlugins = append(allPlugins, gce_pd.ProbeVolumePlugins()...)
 	allPlugins = append(allPlugins, cinder.ProbeVolumePlugins()...)
 	allPlugins = append(allPlugins, flexvolume.ProbeVolumePlugins(config.FlexVolumePluginDir)...)
+	allPlugins = append(allPlugins, vsphere_volume.ProbeVolumePlugins()...)
 	return allPlugins
 }