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

Stop dumping k8s resources with kubetest2-kops 

Signed-off-by: Peter Rifel <pgrifel@gmail.com>
This commit is contained in:
Peter Rifel 2023-12-30 18:55:02 -08:00
parent 8524175f86
commit 64f3e8a1b2
No known key found for this signature in database
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@ import (
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/kops/pkg/resources" "k8s.io/kops/pkg/resources"
"k8s.io/kops/tests/e2e/pkg/kops"
"sigs.k8s.io/kubetest2/pkg/exec" "sigs.k8s.io/kubetest2/pkg/exec"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
) )
@ -45,7 +46,7 @@ func (d *deployer) DumpClusterLogs() error {
} }
klog.Info(strings.Join(args, " ")) klog.Info(strings.Join(args, " "))
cmd := exec.Command(args[0], args[1:]...) cmd := exec.Command(args[0], args[1:]...)
cmd.SetEnv(d.env()...) cmd.SetEnv(append(d.env(), "KOPS_TOOLBOX_DUMP_K8S_RESOURCES=1")...)
cmd.SetStdout(yamlFile) cmd.SetStdout(yamlFile)
cmd.SetStderr(os.Stderr) cmd.SetStderr(os.Stderr)
@ -60,11 +61,19 @@ func (d *deployer) DumpClusterLogs() error {
dumpErr = errors.Join(dumpErr, err) dumpErr = errors.Join(dumpErr, err)
} }
if err := d.dumpClusterInfo(); err != nil { kopsVersion, err := kops.GetVersion(d.KopsBinaryPath)
klog.Warningf("cluster info dump failed: %v", err) if err != nil {
klog.Warningf("kops version failed: %v", err)
dumpErr = errors.Join(dumpErr, err) dumpErr = errors.Join(dumpErr, err)
} }
if kopsVersion == "" || kopsVersion < "1.29" {
// TODO: remove when kubetest2-kops stops testing against kops 1.28 and older
if err := d.dumpClusterInfo(); err != nil {
klog.Warningf("cluster info dump failed: %v", err)
dumpErr = errors.Join(dumpErr, err)
}
}
return dumpErr return dumpErr
} }