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

Merge pull request #12377 from rifelpet/dump-k8s-ssh 

Fix parsing of kops toolbox dump yaml output
This commit is contained in:
Kubernetes Prow Robot 2021-09-20 05:44:09 -07:00 committed by GitHub
parent fb9a7f87c6 6deeda1ea2
commit 8b9f4ec41c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/e2e/go.mod
View File

@ -13,6 +13,7 @@ require (
k8s.io/kops v0.0.0-00010101000000-000000000000
sigs.k8s.io/boskos v0.0.0-20200710214748-f5935686c7fc
sigs.k8s.io/kubetest2 v0.0.0-20210423234514-1c731a5d2283
sigs.k8s.io/yaml v1.2.0
)
replace k8s.io/kops => ../../.

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

@ -17,7 +17,6 @@ limitations under the License.
package deployer
import (
"encoding/json"
"fmt"
"os"
"path"
@ -26,6 +25,7 @@ import (
"k8s.io/klog/v2"
"k8s.io/kops/pkg/resources"
"sigs.k8s.io/kubetest2/pkg/exec"
"sigs.k8s.io/yaml"
)
func (d *deployer) DumpClusterLogs() error {
@ -111,13 +111,15 @@ func (d *deployer) dumpClusterInfoSSH() error {
"--ssh-user", d.SSHUser,
"-o", "yaml",
}
klog.Info(strings.Join(toolboxDumpArgs, " "))
cmd := exec.Command(toolboxDumpArgs[0], toolboxDumpArgs[1:]...)
dumpOutput, err := exec.Output(cmd)
if err != nil {
return err
}
var dump *resources.Dump
err = json.Unmarshal(dumpOutput, dump)
err = yaml.Unmarshal(dumpOutput, dump)
if err != nil {
return err
}
@ -134,6 +136,8 @@ func (d *deployer) dumpClusterInfoSSH() error {
"-o", "yaml",
"--output-directory", "/tmp/cluster-info",
}
klog.Info(strings.Join(sshArgs, " "))
cmd = exec.Command(sshArgs[0], sshArgs[1:]...)
if err := cmd.Run(); err != nil {
return err
@ -143,6 +147,8 @@ func (d *deployer) dumpClusterInfoSSH() error {
fmt.Sprintf("%v:/tmp/cluster-info", sshURL),
path.Join(d.ArtifactsDir, "cluster-info"),
}
klog.Info(strings.Join(scpArgs, " "))
cmd = exec.Command(scpArgs[0], scpArgs[1:]...)
if err := cmd.Run(); err != nil {
return err
@ -152,6 +158,8 @@ func (d *deployer) dumpClusterInfoSSH() error {
"ssh", "-i", d.SSHPrivateKeyPath, sshURL,
"rm", "-rf", "/tmp/cluster-info",
}
klog.Info(strings.Join(rmArgs, " "))
cmd = exec.Command(rmArgs[0], rmArgs[1:]...)
if err := cmd.Run(); err != nil {
return err