OpenShiftP-281: update the CreateClaimSpecFile function to account for maximum one /dev/crypto/nx-gzip

Signed-off-by: Paul Bastide <[email protected]>

Author: prb112

cmd/power-dra-kubeletplugin/cdi.go

@@ -73,29 +73,34 @@ func (cdi *CDIHandler) CreateCommonSpecFile() error {
 func (cdi *CDIHandler) CreateClaimSpecFile(claimUID string, devices PreparedDevices) error {
 	specName := cdiapi.GenerateTransientSpecName(cdiVendor, cdiClass, claimUID)
 
+	// Only one device is used for nx-gzip
+	deviceAdds := []cdispec.Device{
+		cdispec.Device{
+			Name: "crypto/nx-gzip",
+		},
+	}
+
 	spec := &cdispec.Spec{
 		Kind:    cdiKind,
-		Devices: []cdispec.Device{},
+		Devices: deviceAdds,
 	}
 
-	for _, device := range devices {
-		claimEdits := cdiapi.ContainerEdits{
-			ContainerEdits: &cdispec.ContainerEdits{
-				Env: []string{
-					fmt.Sprintf("Nx_DEVICE_%s_RESOURCE_CLAIM=%s", device.DeviceName[4:], claimUID),
-				},
+	claimEdits := cdiapi.ContainerEdits{
+		ContainerEdits: &cdispec.ContainerEdits{
+			Env: []string{
+				"NX_DEVICE_CLAIM=added",
 			},
-		}
-		claimEdits.Append(device.ContainerEdits)
-
-		cdiDevice := cdispec.Device{
-			Name:           fmt.Sprintf("%s-%s", claimUID, device.DeviceName),
-			ContainerEdits: *claimEdits.ContainerEdits,
-		}
+		},
+	}
 
-		spec.Devices = append(spec.Devices, cdiDevice)
+	// At this point
+	cdiDevice := cdispec.Device{
+		Name:           fmt.Sprintf("%s-%s", claimUID, "crypto/nx-gzip"),
+		ContainerEdits: *claimEdits.ContainerEdits,
 	}
 
+	spec.Devices = append(spec.Devices, cdiDevice)
+
 	minVersion, err := cdiapi.MinimumRequiredVersion(spec)
 	if err != nil {
 		return fmt.Errorf("failed to get minimum required CDI spec version: %v", err)

cmd/power-dra-kubeletplugin/discovery.go

@@ -26,8 +26,7 @@ func enumerateAllPossibleDevices(numNx int) (AllocatableDevices, error) {
 		return alldevices, nil
 	}
 
-	// prepopulate
-
+	// prepopulate with a single nx-gzip
 	device := resourceapi.Device{
 		Name: "crypto/nx-gzip",
 		Basic: &resourceapi.BasicDevice{