github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix wrong flexvolume dir on gce ubuntu

Browse Source
This commit is contained in:
Matthew Wong 2018-07-09 15:08:13 -04:00
parent 5232ad4a00
commit 000aea63ca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/storage/flexvolume.go
View File

@ -129,7 +129,7 @@ func uninstallFlex(c clientset.Interface, node *v1.Node, vendor, driver string)
func getFlexDir(c clientset.Interface, node *v1.Node, vendor, driver string) string { func getFlexDir(c clientset.Interface, node *v1.Node, vendor, driver string) string {
volumePluginDir := defaultVolumePluginDir volumePluginDir := defaultVolumePluginDir
if framework.ProviderIs("gce") { if framework.ProviderIs("gce") {
if node == nil && framework.MasterOSDistroIs("gci") { if node == nil && framework.MasterOSDistroIs("gci", "ubuntu") {
v, err := getMasterVersion(c) v, err := getMasterVersion(c)
if err != nil { if err != nil {
framework.Failf("Error getting master version: %v", err) framework.Failf("Error getting master version: %v", err)
@ -140,7 +140,7 @@ func getFlexDir(c clientset.Interface, node *v1.Node, vendor, driver string) str
} else { } else {
volumePluginDir = gciVolumePluginDirLegacy volumePluginDir = gciVolumePluginDirLegacy
} }
} else if node != nil && framework.NodeOSDistroIs("gci") { } else if node != nil && framework.NodeOSDistroIs("gci", "ubuntu") {
if getNodeVersion(node).AtLeast(versionutil.MustParseGeneric(gciVolumePluginDirVersion)) { if getNodeVersion(node).AtLeast(versionutil.MustParseGeneric(gciVolumePluginDirVersion)) {
volumePluginDir = gciVolumePluginDir volumePluginDir = gciVolumePluginDir
} else { } else {