*: update "KubectlCommand"

Signed-off-by: Gyuho Lee <[email protected]>

eksconfig/config.go

@@ -983,16 +983,6 @@ func (cfg *Config) UpdateFromEnvs() error {
 	return nil
 }
 
-// ArgsKubectlVersion returns the parameters to "kubectl" tests.
-func (cfg *Config) ArgsKubectlVersion() []string {
-	return []string{
-		cfg.KubectlPath,
-		"--kubeconfig=" + cfg.KubeConfigPath,
-		"--match-server-version=false",
-		"version",
-	}
-}
-
 // supportedKubernetesVersions is a list of EKS supported Kubernets versions.
 var supportedKubernetesVersions = map[string]struct{}{
 	"1.10": {},

internal/eks/tester_embedded.go

@@ -344,11 +344,7 @@ func newTesterEmbedded(cfg *eksconfig.Config) (ekstester.Tester, error) {
 
 // KubectlCommand returns "kubectl" command object for API reachability tests.
 func (md *embedded) KubectlCommand() (*osexec.Cmd, error) {
-	args := md.cfg.ArgsKubectlVersion()
-	if len(args) < 1 {
-		return nil, errors.New("empty kubectl arguments")
-	}
-	return osexec.Command(args[0], args[1:]...), nil
+	return osexec.Command(md.cfg.KubectlPath, "--kubeconfig="+md.cfg.KubeConfigPath), nil
 }
 
 // Up creates an EKS cluster for 'kubetest'.

kubetest/eks/eks.go

@@ -20,7 +20,6 @@ limitations under the License.
 package eks
 
 import (
-	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -229,11 +228,7 @@ func (dp *deployer) KubectlCommand() (*osexec.Cmd, error) {
 	if _, err := dp.LoadConfig(); err != nil {
 		return nil, err
 	}
-	args := dp.cfg.ArgsKubectlVersion()
-	if len(args) < 1 {
-		return nil, errors.New("empty kubectl arguments")
-	}
-	return osexec.Command(args[0], args[1:]...), nil
+	return osexec.Command(dp.cfg.KubectlPath, "--kubeconfig="+dp.cfg.KubeConfigPath), nil
 }
 
 // Stop stops ongoing operations.