From 98a5f7a34f79218f84134f7a338b1b71d6024261 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Sat, 30 Dec 2023 18:55:02 -0800 Subject: [PATCH] Stop dumping k8s resources with kubetest2-kops Signed-off-by: Peter Rifel --- tests/e2e/kubetest2-kops/deployer/dumplogs.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/e2e/kubetest2-kops/deployer/dumplogs.go b/tests/e2e/kubetest2-kops/deployer/dumplogs.go index 01e093f3de536..d191c93651a59 100644 --- a/tests/e2e/kubetest2-kops/deployer/dumplogs.go +++ b/tests/e2e/kubetest2-kops/deployer/dumplogs.go @@ -25,6 +25,7 @@ import ( "k8s.io/klog/v2" "k8s.io/kops/pkg/resources" + "k8s.io/kops/tests/e2e/pkg/kops" "sigs.k8s.io/kubetest2/pkg/exec" "sigs.k8s.io/yaml" ) @@ -45,7 +46,7 @@ func (d *deployer) DumpClusterLogs() error { } klog.Info(strings.Join(args, " ")) 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.SetStderr(os.Stderr) @@ -60,11 +61,18 @@ func (d *deployer) DumpClusterLogs() error { dumpErr = errors.Join(dumpErr, err) } - if err := d.dumpClusterInfo(); err != nil { - klog.Warningf("cluster info dump failed: %v", err) + kopsVersion, err := kops.GetVersion(d.KopsBinaryPath) + if err != nil { + klog.Warningf("kops version failed: %v", err) dumpErr = errors.Join(dumpErr, err) } + if kopsVersion == "" || kopsVersion < "1.29" { + if err := d.dumpClusterInfo(); err != nil { + klog.Warningf("cluster info dump failed: %v", err) + dumpErr = errors.Join(dumpErr, err) + } + } return dumpErr }