print-api7-ingress-system-logs

Author: dspo

.github/workflows/e2e-test.yml

@@ -89,7 +89,7 @@ jobs:
         run: |
           ls *.log
           for log_file in $(find . -type f -name "*.log"); do
-              echo "================= $log_file =======================>>"
+              echo "\n================= $log_file =======================>>"
               cat "$log_file"
-              echo "<<================= $log_file ======================="
+              echo "<<================= $log_file =======================\n"
           done

internal/provider/adc/adc.go

@@ -77,7 +77,7 @@ func (d *adcClient) Delete(ctx context.Context, obj client.Object) error {
 func (d *adcClient) sync(task Task) error {
 	log.Debugw("syncing task", zap.Any("task", task))
 
-	yaml, err := yaml.Marshal(task.Resources)
+	data, err := yaml.Marshal(task.Resources)
 	if err != nil {
 		return err
 	}
@@ -91,9 +91,9 @@ func (d *adcClient) sync(task Task) error {
 		_ = os.Remove(tmpFile.Name())
 	}()
 
-	log.Debugw("syncing resources", zap.String("file", tmpFile.Name()), zap.String("yaml", string(yaml)))
+	log.Debugw("syncing resources", zap.String("file", tmpFile.Name()), zap.String("yaml", string(data)))
 
-	if _, err := tmpFile.Write(yaml); err != nil {
+	if _, err := tmpFile.Write(data); err != nil {
 		return err
 	}
 
@@ -118,5 +118,6 @@ func (d *adcClient) sync(task Task) error {
 		)
 		return err
 	}
+
 	return nil
 }

internal/provider/adc/adc_cmd.go

@@ -44,15 +44,14 @@ type adcSyncer struct {
 	envs   []string
 	stdout io.Writer
 	stderr io.Writer
-	cmd    *exec.Cmd
 }
 
 func (adc *adcSyncer) Run() error {
 	cmd := exec.Command("adc", adc.args...)
 	cmd.Env = adc.envs
 	cmd.Stdout = adc.stdout
 	cmd.Stderr = adc.stderr
-	return adc.cmd.Run()
+	return cmd.Run()
 }
 
 func (adc *adcSyncer) Stdout(stdout io.Writer) Syncer {
@@ -86,8 +85,10 @@ func (adc *adcSyncer) GatewayGroup(gatewayGroup string) Syncer {
 }
 
 func (adc *adcSyncer) LabelSelectors(values map[string]string) Syncer {
-	for key, value := range values {
-		adc.LabelSelector(key, value)
+	if len(values) > 0 {
+		for key, value := range values {
+			adc.LabelSelector(key, value)
+		}
 	}
 	return adc
 }

test/e2e/scaffold/scaffold.go

@@ -16,10 +16,12 @@
 package scaffold
 
 import (
+	"bytes"
 	"context"
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
+	"io"
 	"net"
 	"net/http"
 	"net/url"
@@ -456,18 +458,25 @@ func (s *Scaffold) afterEach() {
 
 	if CurrentSpecReport().Failed() {
 		if os.Getenv("TSET_ENV") == "CI" {
+			var buf = bytes.NewBuffer(nil)
 			_, _ = fmt.Fprintln(GinkgoWriter, "Dumping namespace contents")
 			output, _ := k8s.RunKubectlAndGetOutputE(GinkgoT(), s.kubectlOptions, "get", "deploy,sts,svc,pods")
 			if output != "" {
-				_, _ = fmt.Fprintln(GinkgoWriter, output)
+				_, _ = fmt.Fprintln(io.MultiWriter(GinkgoWriter, buf), output)
 			}
 			output, _ = k8s.RunKubectlAndGetOutputE(GinkgoT(), s.kubectlOptions, "describe", "pods")
 			if output != "" {
-				_, _ = fmt.Fprintln(GinkgoWriter, output)
+				_, _ = buf.WriteString("/n")
+				_, _ = fmt.Fprintln(io.MultiWriter(GinkgoWriter, buf), output)
 			}
-			output, _ = k8s.RunKubectlAndGetOutputE(GinkgoT(), s.kubectlOptions, "logs", "-l", "control-plane=controller-manager")
+			output, _ = k8s.RunKubectlAndGetOutputE(GinkgoT(), s.kubectlOptions, "logs", "-l",
+				"control-plane=controller-manager")
 			if output != "" {
-				require.NoError(GinkgoT(), os.WriteFile("../../"+s.namespace+"-controller-manager.log", []byte(output), 0644))
+				_, _ = buf.WriteString("/n")
+				_, _ = buf.WriteString("controller-manager log\n")
+				_, _ = buf.WriteString(output)
+				_, _ = buf.WriteString("/n")
+				require.NoError(GinkgoT(), os.WriteFile("../../"+s.namespace+"-controller-manager.log", buf.Bytes(), 0644))
 			}
 		}
 	}