kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10676 from rifelpet/kubetest2-dump-user 

kubetest2 - Use --ssh-user to dump logs
This commit is contained in:
Kubernetes Prow Robot 2021-01-28 20:37:41 -08:00 committed by GitHub
parent 6afbfe17c1 accbf7986d
commit 6fbc742141
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/e2e/kubetest2-kops/deployer/common.go
View File

@ -68,6 +68,9 @@ func (d *deployer) initialize() error {
if d.SSHPublicKeyPath == "" { if d.SSHPublicKeyPath == "" {
d.SSHPublicKeyPath = os.Getenv("AWS_SSH_PUBLIC_KEY_FILE") d.SSHPublicKeyPath = os.Getenv("AWS_SSH_PUBLIC_KEY_FILE")
} }
if d.SSHUser == "" {
d.SSHUser = os.Getenv("KUBE_SSH_USER")
}
return nil return nil
} }

6
tests/e2e/kubetest2-kops/deployer/deployer.go
View File

@ -56,9 +56,9 @@ type deployer struct {
KubernetesVersion string `flag:"kubernetes-version" desc:"The kubernetes version to use in the cluster"` 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"` 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"` 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"` SSHUser string `flag:"ssh-user" desc:"The SSH user to use for SSH access to instances"`
ArtifactsDir string `flag:"-"` ArtifactsDir string `flag:"-"`

1
tests/e2e/kubetest2-kops/deployer/dumplogs.go
View File

@ -33,6 +33,7 @@ func (d *deployer) DumpClusterLogs() error {
"--name", d.ClusterName, "--name", d.ClusterName,
"--dir", d.ArtifactsDir, "--dir", d.ArtifactsDir,
"--private-key", d.SSHPrivateKeyPath, "--private-key", d.SSHPrivateKeyPath,
"--ssh-user", d.SSHUser,
} }
klog.Info(strings.Join(args, " ")) klog.Info(strings.Join(args, " "))
cmd := exec.Command(args[0], args[1:]...) cmd := exec.Command(args[0], args[1:]...)