numalign: compat with newer sriov device plugins

ffromani · ffromani · commit 93666d1039a2 · 2023-06-05T08:25:23.000+02:00
Starting OCP &gt;= 4.13 the SRIOV device plugin is also exporting device info as JSON snippet.
We need to avoid that because it confuses our logic.

Signed-off-by: Francesco Romani &lt;fromani@redhat.com&gt;
diff --git a/internal/pkg/numalign/numalign.go b/internal/pkg/numalign/numalign.go
@@ -183,6 +183,10 @@ func GetPCIDevicesFromEnv(environ []string) []string {
 		if !strings.HasPrefix(envVar, "PCIDEVICE_") {
 			continue
 		}
+		if strings.Contains(envVar, "_INFO=") {
+			// sriov device plugin found in OpenShift >= 4.13 (TODO: narro down version)
+			continue
+		}
 		pair := strings.SplitN(envVar, "=", 2)
 		pciDevs = append(pciDevs, pair[1])
 	}

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,10 @@ func GetPCIDevicesFromEnv(environ []string) []string {`
`183`	`183`	`if !strings.HasPrefix(envVar, "PCIDEVICE_") {`
`184`	`184`	`continue`
`185`	`185`	`}`
	`186`	`+ if strings.Contains(envVar, "_INFO=") {`
	`187`	`+ // sriov device plugin found in OpenShift >= 4.13 (TODO: narro down version)`
	`188`	`+ continue`
	`189`	`+ }`
`186`	`190`	`pair := strings.SplitN(envVar, "=", 2)`
`187`	`191`	`pciDevs = append(pciDevs, pair[1])`
`188`	`192`	`}`