mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #71480 from msau42/remove-legacy-flex-e2e
Remove legacy gci flex directory from e2e tests
This commit is contained in:
commit
9ebf53fffd
@ -45,8 +45,6 @@ const (
|
|||||||
// controller-manager has started with --flex-volume-plugin-dir equal to this
|
// controller-manager has started with --flex-volume-plugin-dir equal to this
|
||||||
// (see cluster/gce/config-test.sh)
|
// (see cluster/gce/config-test.sh)
|
||||||
gciVolumePluginDir = "/home/kubernetes/flexvolume"
|
gciVolumePluginDir = "/home/kubernetes/flexvolume"
|
||||||
gciVolumePluginDirLegacy = "/etc/srv/kubernetes/kubelet-plugins/volume/exec"
|
|
||||||
gciVolumePluginDirVersion = "1.10.0"
|
|
||||||
detachTimeout = 10 * time.Second
|
detachTimeout = 10 * time.Second
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -130,24 +128,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", "ubuntu") {
|
|
||||||
v, err := getMasterVersion(c)
|
|
||||||
if err != nil {
|
|
||||||
framework.Failf("Error getting master version: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if v.AtLeast(versionutil.MustParseGeneric(gciVolumePluginDirVersion)) {
|
|
||||||
volumePluginDir = gciVolumePluginDir
|
volumePluginDir = gciVolumePluginDir
|
||||||
} else {
|
|
||||||
volumePluginDir = gciVolumePluginDirLegacy
|
|
||||||
}
|
|
||||||
} else if node != nil && framework.NodeOSDistroIs("gci", "ubuntu") {
|
|
||||||
if getNodeVersion(node).AtLeast(versionutil.MustParseGeneric(gciVolumePluginDirVersion)) {
|
|
||||||
volumePluginDir = gciVolumePluginDir
|
|
||||||
} else {
|
|
||||||
volumePluginDir = gciVolumePluginDirLegacy
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
flexDir := path.Join(volumePluginDir, fmt.Sprintf("/%s~%s/", vendor, driver))
|
flexDir := path.Join(volumePluginDir, fmt.Sprintf("/%s~%s/", vendor, driver))
|
||||||
return flexDir
|
return flexDir
|
||||||
|
Loading…
Reference in New Issue
Block a user