@@ -90,7 +90,7 @@ func getPodContainerLogs(podName, containerName string) (string, error) {
9090 return output , nil
9191}
9292
93- func dumpKubemacpoolLogs (failureCount int ) {
93+ func dumpManagerNamespaceArtifacts (failureCount int ) {
9494 if err := logPods (managerNamespace , failureCount ); err != nil {
9595 fmt .Println (err )
9696 }
@@ -110,7 +110,9 @@ func dumpKubemacpoolLogs(failureCount int) {
110110 if err := logConfigMaps (managerNamespace , failureCount ); err != nil {
111111 fmt .Println (err )
112112 }
113+ }
113114
115+ func dumpKubeVirtArtifacts (failureCount int ) {
114116 if err := logVirtualMachines (failureCount ); err != nil {
115117 fmt .Println (err )
116118 }
@@ -119,40 +121,51 @@ func dumpKubemacpoolLogs(failureCount int) {
119121 fmt .Println (err )
120122 }
121123
122- if err := logAllPods (failureCount ); err != nil {
124+ if err := logVirtualMachineInstanceMigrations (failureCount ); err != nil {
123125 fmt .Println (err )
124126 }
125127
126- if err := logNetworkAttachmentDefinitions (failureCount ); err != nil {
128+ if err := logKubevirtPods (failureCount ); err != nil {
127129 fmt .Println (err )
128130 }
129131
130- if err := logNamespaces (failureCount ); err != nil {
132+ if err := logKubevirtConfig (failureCount ); err != nil {
131133 fmt .Println (err )
132134 }
135+ }
133136
134- if err := logVirtualMachineInstanceMigrations (failureCount ); err != nil {
137+ func dumpClusterWideArtifacts (failureCount int ) {
138+ if err := logAllPods (failureCount ); err != nil {
135139 fmt .Println (err )
136140 }
137141
138- if err := logKubevirtPods (failureCount ); err != nil {
142+ if err := logNetworkAttachmentDefinitions (failureCount ); err != nil {
139143 fmt .Println (err )
140144 }
141145
142- if err := logKubevirtConfig (failureCount ); err != nil {
146+ if err := logNamespaces (failureCount ); err != nil {
143147 fmt .Println (err )
144148 }
145149
146150 if err := logNodes (failureCount ); err != nil {
147151 fmt .Println (err )
148152 }
153+ }
149154
155+ func dumpCollisionArtifacts (failureCount int ) {
150156 // Dump collision gauge values to help debug alert flakiness / lingering collisions.
151157 if err := logMACCollisionGauge (failureCount ); err != nil {
152158 fmt .Println (err )
153159 }
154160}
155161
162+ func dumpKubemacpoolLogs (failureCount int ) {
163+ dumpManagerNamespaceArtifacts (failureCount )
164+ dumpKubeVirtArtifacts (failureCount )
165+ dumpClusterWideArtifacts (failureCount )
166+ dumpCollisionArtifacts (failureCount )
167+ }
168+
156169func logPodContainersLogs (podName string , containers []corev1.Container , failureCount int ) error {
157170 for i := range containers {
158171 containerName := containers [i ].Name
@@ -716,7 +729,6 @@ func appendMACCollisionLines(b *strings.Builder, metrics string, vmiByMAC map[st
716729var macLabelValueRE = regexp .MustCompile (`\bmac="([^"]+)"` )
717730
718731func parseMACLabelValue (line string ) (string , bool ) {
719-
720732 m := macLabelValueRE .FindStringSubmatch (line )
721733 if len (m ) != 2 {
722734 return "" , false
0 commit comments