diff --git a/eksconfig/config.go b/eksconfig/config.go index e1e2941c8..7ec10556b 100644 --- a/eksconfig/config.go +++ b/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": {}, diff --git a/internal/eks/tester_embedded.go b/internal/eks/tester_embedded.go index 255ced766..1c3586dab 100644 --- a/internal/eks/tester_embedded.go +++ b/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'. diff --git a/kubetest/eks/eks.go b/kubetest/eks/eks.go index 5c71d3f0c..92f76091f 100644 --- a/kubetest/eks/eks.go +++ b/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.