diff --git a/tests/e2e/kubetest2-kops/deployer/common.go b/tests/e2e/kubetest2-kops/deployer/common.go index 32ba262b17..9248936a2b 100644 --- a/tests/e2e/kubetest2-kops/deployer/common.go +++ b/tests/e2e/kubetest2-kops/deployer/common.go @@ -68,6 +68,9 @@ func (d *deployer) initialize() error { if d.SSHPublicKeyPath == "" { d.SSHPublicKeyPath = os.Getenv("AWS_SSH_PUBLIC_KEY_FILE") } + if d.SSHUser == "" { + d.SSHUser = os.Getenv("KUBE_SSH_USER") + } return nil } diff --git a/tests/e2e/kubetest2-kops/deployer/deployer.go b/tests/e2e/kubetest2-kops/deployer/deployer.go index 92ab1a1009..f401051365 100644 --- a/tests/e2e/kubetest2-kops/deployer/deployer.go +++ b/tests/e2e/kubetest2-kops/deployer/deployer.go @@ -56,9 +56,9 @@ type deployer struct { KubernetesVersion string `flag:"kubernetes-version" desc:"The kubernetes version to use in the cluster"` - SSHPrivateKeyPath string `flag:"ssh-private-key" desc:"The path to the private key used for SSH access to instances"` - SSHPublicKeyPath string `flag:"ssh-public-key" desc:"The path to the public key passed to the cloud provider"` - SSHUser []string `flag:"ssh-user" desc:"The SSH users to use for SSH access to instances"` + SSHPrivateKeyPath string `flag:"ssh-private-key" desc:"The path to the private key used for SSH access to instances"` + SSHPublicKeyPath string `flag:"ssh-public-key" desc:"The path to the public key passed to the cloud provider"` + SSHUser string `flag:"ssh-user" desc:"The SSH user to use for SSH access to instances"` ArtifactsDir string `flag:"-"` diff --git a/tests/e2e/kubetest2-kops/deployer/dumplogs.go b/tests/e2e/kubetest2-kops/deployer/dumplogs.go index a9b1b42248..fb127bf557 100644 --- a/tests/e2e/kubetest2-kops/deployer/dumplogs.go +++ b/tests/e2e/kubetest2-kops/deployer/dumplogs.go @@ -33,6 +33,7 @@ func (d *deployer) DumpClusterLogs() error { "--name", d.ClusterName, "--dir", d.ArtifactsDir, "--private-key", d.SSHPrivateKeyPath, + "--ssh-user", d.SSHUser, } klog.Info(strings.Join(args, " ")) cmd := exec.Command(args[0], args[1:]...)