From 21f21945b2b09f80d96514e54350fbbb7ed7da97 Mon Sep 17 00:00:00 2001 From: Cheng Xing Date: Fri, 5 Jan 2018 16:18:08 -0800 Subject: [PATCH] Removing Flexvolume feature tag in e2e tests and alpha tag in Flex path arguments because Flexvolume is now GA. --- cmd/kubelet/app/options/options.go | 2 +- test/e2e/storage/flexvolume.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index 250da221f3b..a4f1d3dc530 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -359,7 +359,7 @@ func (f *KubeletFlags) AddFlags(fs *pflag.FlagSet) { fs.Var(flag.NewMapStringString(&f.ExperimentalQOSReserved), "experimental-qos-reserved", "A set of ResourceName=Percentage (e.g. memory=50%) pairs that describe how pod resource requests are reserved at the QoS level. Currently only memory is supported. [default=none]") bindableNodeLabels := flag.ConfigurationMap(f.NodeLabels) fs.Var(&bindableNodeLabels, "node-labels", " Labels to add when registering the node in the cluster. Labels must be key=value pairs separated by ','.") - fs.StringVar(&f.VolumePluginDir, "volume-plugin-dir", f.VolumePluginDir, " The full path of the directory in which to search for additional third party volume plugins") + fs.StringVar(&f.VolumePluginDir, "volume-plugin-dir", f.VolumePluginDir, "The full path of the directory in which to search for additional third party volume plugins") fs.StringVar(&f.LockFilePath, "lock-file", f.LockFilePath, " The path to file for kubelet to use as a lock file.") fs.BoolVar(&f.ExitOnLockContention, "exit-on-lock-contention", f.ExitOnLockContention, "Whether kubelet should exit upon lock-file contention.") fs.StringVar(&f.SeccompProfileRoot, "seccomp-profile-root", f.SeccompProfileRoot, " Directory path for seccomp profiles.") diff --git a/test/e2e/storage/flexvolume.go b/test/e2e/storage/flexvolume.go index 99aafb95c06..06de00d1ad2 100644 --- a/test/e2e/storage/flexvolume.go +++ b/test/e2e/storage/flexvolume.go @@ -137,7 +137,7 @@ func sshAndLog(cmd, host string) { } } -var _ = utils.SIGDescribe("Flexvolumes [Disruptive] [Feature:FlexVolume]", func() { +var _ = utils.SIGDescribe("Flexvolumes [Disruptive]", func() { f := framework.NewDefaultFramework("flexvolume") // note that namespace deletion is handled by delete-namespace flag