Merge pull request #3097 from CecileRobertMichon/describe-pods

Add pod describe to e2e logger

Author: k8s-ci-robot

go.mod

@@ -96,6 +96,7 @@ require (
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
+	github.com/fatih/camelcase v1.0.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect

go.sum

@@ -227,6 +227,8 @@ github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJ
 github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
+github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=
+github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=

test/e2e/azure_clusterproxy.go

@@ -43,6 +43,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/kubectl/pkg/describe"
 	infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1"
 	infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1"
 	azureutil "sigs.k8s.io/cluster-api-provider-azure/util/azure"
@@ -111,26 +112,21 @@ func (acp *AzureClusterProxy) collectPodLogs(ctx context.Context, namespace stri
 
 	Expect(workload.GetClient().List(ctx, pods)).To(Succeed())
 
-	var events = make(map[string]*corev1.EventList)
 	var err error
+	var podDescribe string
+
+	podDescriber, ok := describe.DescriberFor(schema.GroupKind{Group: corev1.GroupName, Kind: "Pod"}, workload.GetRESTConfig())
+	if !ok {
+		Logf("failed to get pod describer")
+	}
 
 	for _, pod := range pods.Items {
 		podNamespace := pod.GetNamespace()
 
-		// Collect events for Pod.
-		if _, ok := events[podNamespace]; !ok {
-			events[podNamespace], err = workload.GetClientSet().CoreV1().Events(podNamespace).List(ctx, metav1.ListOptions{})
-			if err != nil {
-				Logf("failed to get events in %s namespace: %v", podNamespace, err)
-			}
-		}
-
-		var eventMsgs string
-
-		for _, event := range events[podNamespace].Items {
-			if event.InvolvedObject.Kind == "Pod" && event.InvolvedObject.Name == pod.GetName() {
-				eventMsgs += fmt.Sprintf("%s\n", event.Message)
-			}
+		// Describe the pod.
+		podDescribe, err = podDescriber.Describe(podNamespace, pod.GetName(), describe.DescriberSettings{ShowEvents: true})
+		if err != nil {
+			Logf("failed to describe pod %s/%s: %v", podNamespace, pod.GetName(), err)
 		}
 
 		for _, container := range pod.Spec.Containers {
@@ -180,28 +176,28 @@ func (acp *AzureClusterProxy) collectPodLogs(ctx context.Context, namespace stri
 		go func(pod corev1.Pod) {
 			defer GinkgoRecover()
 
-			Logf("Collecting events for Pod %s/%s", podNamespace, pod.Name)
-			eventFile := path.Join(aboveMachinesPath, podNamespace, pod.Name, "pod-events.txt")
-			if err := os.MkdirAll(filepath.Dir(eventFile), 0o755); err != nil {
+			Logf("Describing Pod %s/%s", podNamespace, pod.Name)
+			describeFile := path.Join(aboveMachinesPath, podNamespace, pod.Name, "pod-describe.txt")
+			if err := os.MkdirAll(filepath.Dir(describeFile), 0o755); err != nil {
 				// Failing to mkdir should not cause the test to fail
 				Logf("Error mkdir: %v", err)
 				return
 			}
 
-			f, err := os.OpenFile(eventFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o644)
+			f, err := os.OpenFile(describeFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o644)
 			if err != nil {
 				// Failing to open the file should not cause the test to fail
-				Logf("Error opening file to write Pod events: %v", err)
+				Logf("Error opening file to write Pod describe: %v", err)
 				return
 			}
 			defer f.Close()
 
 			out := bufio.NewWriter(f)
 			defer out.Flush()
-			_, err = out.WriteString(eventMsgs)
+			_, err = out.WriteString(podDescribe)
 			if errors.Is(err, io.ErrUnexpectedEOF) {
-				// Failing to collect event message should not cause the test to fail
-				Logf("failed to collect event message of pod %s/%s: %v", podNamespace, pod.Name, err)
+				// Failing to describe pod should not cause the test to fail
+				Logf("failed to describe pod %s/%s: %v", podNamespace, pod.Name, err)
 			}
 		}(pod)
 	}