print-api7-ingress-system-logs

Author: dspo

.github/workflows/e2e-test.yml

@@ -86,4 +86,4 @@ jobs:
       - name: Pint Ingress Controller Logs
         if: failure()
         run: |
-          make print-api7-ingress-system-logs
+          cat ingress-controller-logs.log

Makefile

@@ -264,9 +264,6 @@ gofmt: ## Apply go fmt
 	@go fmt ./...
 .PHONY: gofmt
 
-print-api7-ingress-system-logs:
-	@kubectl get pods -o=name -n api7-ingress-system | xargs -I{} bash -c "echo ================= {} ==================== &&  kubectl logs --all-containers -n api7-ingress-system {} && echo ================= {} ===================="
-
 # go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist
 # $1 - target path with name of binary
 # $2 - package url which can be installed

test/e2e/scaffold/scaffold.go

@@ -34,6 +34,7 @@ import (
 	"github.com/gruntwork-io/terratest/modules/testing"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -462,6 +463,11 @@ func (s *Scaffold) afterEach() {
 			if output != "" {
 				_, _ = fmt.Fprintln(GinkgoWriter, output)
 			}
+
+			output, _ = k8s.RunKubectlAndGetOutputE(GinkgoT(), s.kubectlOptions, "logs", "--all-containers")
+			if output != "" {
+				require.NoError(GinkgoT(), os.WriteFile("../../ingress-controller-logs.log", []byte(output), 0644))
+			}
 		}
 	}