-
Notifications
You must be signed in to change notification settings - Fork 114
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Utilize the k8s-reporter in the e2e tests
Modify the k8sreporter/reporter.go to utilize the latest external k8s-reporter package. The new reporter still outputs the same output as before plus the CRDs: SriovOperatorConfig and SriovNetwork. It is used by the conformance and validation suites, consumes the flag "-report" as the path to where the dir "sriov_failure_report.log" will be created and hold all of the failed tests logs. Also removed the unused `-junit` flag, as we're using Ginkgo's built it --junit-report tool. Added the `-report` flag to the run-e2e-conformance.sh script. Signed-off-by: Lior Noy <[email protected]>
- Loading branch information
Showing
15 changed files
with
656 additions
and
207 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,144 +1,53 @@ | ||
| package k8sreporter | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "fmt" | ||
| "io" | ||
| "errors" | ||
| "os" | ||
| "strings" | ||
| "sync" | ||
|
|
||
| "github.com/onsi/ginkgo/v2/types" | ||
| corev1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| runtimeclient "sigs.k8s.io/controller-runtime/pkg/client" | ||
| kniK8sReporter "github.com/openshift-kni/k8sreporter" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
|
|
||
| sriovv1 "github.com/k8snetworkplumbingwg/sriov-network-operator/api/v1" | ||
| testclient "github.com/k8snetworkplumbingwg/sriov-network-operator/test/util/client" | ||
| "github.com/k8snetworkplumbingwg/sriov-network-operator/test/util/namespaces" | ||
| ) | ||
|
|
||
| type KubernetesReporter struct { | ||
| sync.Mutex | ||
| clients *testclient.ClientSet | ||
| dumpOutput io.Writer | ||
| } | ||
|
|
||
| func New(clients *testclient.ClientSet, dumpDestination io.Writer) *KubernetesReporter { | ||
| return &KubernetesReporter{clients: clients, dumpOutput: dumpDestination} | ||
| } | ||
|
|
||
| func (r *KubernetesReporter) Report(sr types.SpecReport) { | ||
| r.Lock() | ||
| defer r.Unlock() | ||
| fmt.Fprintln(r.dumpOutput, "Starting dump for failed spec", sr.ContainerHierarchyTexts) | ||
| r.dump() | ||
| fmt.Fprintln(r.dumpOutput, "Finished dump for failed spec") | ||
| } | ||
|
|
||
| func (r *KubernetesReporter) dump() { | ||
| r.logNodes() | ||
| r.logPods("openshift-sriov-network-operator") | ||
| r.logPods(namespaces.Test) | ||
| r.logLogs(func(p *corev1.Pod) bool { | ||
| return !strings.HasPrefix(p.Name, "sriov-") | ||
| }) | ||
| r.logSriovNodeState() | ||
| r.logNetworkPolicies() | ||
| } | ||
|
|
||
| func (r *KubernetesReporter) logPods(namespace string) { | ||
| fmt.Fprintf(r.dumpOutput, "Logging pods for %s", namespace) | ||
|
|
||
| pods, err := r.clients.Pods(namespace).List(context.Background(), metav1.ListOptions{}) | ||
| if err != nil { | ||
| fmt.Fprintf(os.Stderr, "failed to fetch pods: %v\n", err) | ||
| return | ||
| } | ||
|
|
||
| j, err := json.MarshalIndent(pods, "", " ") | ||
| if err != nil { | ||
| fmt.Println("Failed to marshal pods", err) | ||
| return | ||
| } | ||
| fmt.Fprintln(r.dumpOutput, string(j)) | ||
| } | ||
|
|
||
| func (r *KubernetesReporter) logNodes() { | ||
| fmt.Fprintf(r.dumpOutput, "Logging nodes") | ||
|
|
||
| nodes, err := r.clients.CoreV1Interface.Nodes().List(context.Background(), metav1.ListOptions{}) | ||
| if err != nil { | ||
| fmt.Fprintf(os.Stderr, "failed to fetch nodes: %v\n", err) | ||
| return | ||
| } | ||
|
|
||
| j, err := json.MarshalIndent(nodes, "", " ") | ||
| if err != nil { | ||
| fmt.Println("Failed to marshal nodes") | ||
| return | ||
| } | ||
| fmt.Fprintln(r.dumpOutput, string(j)) | ||
| } | ||
|
|
||
| func (r *KubernetesReporter) logLogs(filterPods func(*corev1.Pod) bool) { | ||
| fmt.Fprintf(r.dumpOutput, "Logging pods logs") | ||
|
|
||
| pods, err := r.clients.Pods(corev1.NamespaceAll).List(context.Background(), metav1.ListOptions{}) | ||
| if err != nil { | ||
| fmt.Fprintf(os.Stderr, "failed to fetch pods: %v\n", err) | ||
| return | ||
| } | ||
|
|
||
| for _, pod := range pods.Items { | ||
| if filterPods(&pod) { | ||
| continue | ||
| } | ||
| for _, container := range pod.Spec.Containers { | ||
| logs, err := r.clients.Pods(pod.Namespace).GetLogs(pod.Name, &corev1.PodLogOptions{Container: container.Name}).DoRaw(context.Background()) | ||
| if err == nil { | ||
| fmt.Fprintf(r.dumpOutput, "Dumping logs for pod %s-%s-%s", pod.Namespace, pod.Name, container.Name) | ||
| fmt.Fprintln(r.dumpOutput, string(logs)) | ||
| } | ||
| func New(reportPath string) (*kniK8sReporter.KubernetesReporter, error) { | ||
| addToScheme := func(s *runtime.Scheme) error { | ||
| err := sriovv1.AddToScheme(s) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| func (r *KubernetesReporter) logNetworkPolicies() { | ||
| fmt.Fprintf(r.dumpOutput, "Logging network policies") | ||
|
|
||
| policies := sriovv1.SriovNetworkNodePolicyList{} | ||
| err := r.clients.List(context.Background(), | ||
| &policies, | ||
| runtimeclient.InNamespace("openshift-sriov-network-operator")) | ||
|
|
||
| if err != nil { | ||
| fmt.Fprintf(os.Stderr, "failed to fetch network policies: %v\n", err) | ||
| return | ||
| dumpNamespace := func(ns string) bool { | ||
| switch { | ||
| case ns == namespaces.Test: | ||
| return true | ||
| case ns == "openshift-sriov-network-operator": | ||
| return true | ||
| case strings.HasPrefix(ns, "sriov-"): | ||
| return true | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| j, err := json.MarshalIndent(policies, "", " ") | ||
| if err != nil { | ||
| fmt.Println("Failed to marshal policies") | ||
| return | ||
| crds := []kniK8sReporter.CRData{ | ||
| {Cr: &sriovv1.SriovNetworkNodeStateList{}}, | ||
| {Cr: &sriovv1.SriovNetworkNodePolicyList{}}, | ||
| {Cr: &sriovv1.SriovNetworkList{}}, | ||
| {Cr: &sriovv1.SriovOperatorConfigList{}}, | ||
| } | ||
| fmt.Fprintln(r.dumpOutput, string(j)) | ||
| } | ||
|
|
||
| func (r *KubernetesReporter) logSriovNodeState() { | ||
| fmt.Fprintf(r.dumpOutput, "Logging node states") | ||
|
|
||
| nodeStates, err := r.clients.SriovNetworkNodeStates("openshift-sriov-network-operator").List(context.Background(), metav1.ListOptions{}) | ||
| if err != nil { | ||
| fmt.Fprintf(os.Stderr, "failed to fetch node states: %v\n", err) | ||
| return | ||
| err := os.Mkdir(reportPath, 0755) | ||
| if err != nil && !errors.Is(err, os.ErrExist) { | ||
| return nil, err | ||
| } | ||
|
|
||
| j, err := json.MarshalIndent(nodeStates, "", " ") | ||
| reporter, err := kniK8sReporter.New("", addToScheme, dumpNamespace, reportPath, crds...) | ||
| if err != nil { | ||
| fmt.Println("Failed to marshal node states") | ||
| return | ||
| return nil, err | ||
| } | ||
| fmt.Fprintln(r.dumpOutput, string(j)) | ||
| return reporter, nil | ||
| } |
Oops, something went wrong.