Merge pull request #127 from almaslennikov/bfb-update

feat: provision and install BFB files

Author: almaslennikov

README.md

@@ -135,6 +135,15 @@ spec:
   # a list of firmware binaries from mlnx website if they are zipped try to unzip before placing
   binUrlSources:
     - https://www.mellanox.com/downloads/firmware/fw-ConnectX6Dx-rel-22_44_1036-MCX623106AC-CDA_Ax-UEFI-14.37.14-FlexBoot-3.7.500.signed.bin.zip
+  bfbUrlSource: https://example.com/bluefield3-31.41.0.bfb
+status:
+  state: Success
+  binaryVersions:
+    22.44.1036:
+    - mt_0000000436
+  bfbVersions:
+    a2dc: 34.41.0 # BF3 NIC FW
+    a2d6: 25.21.0 # BF2 NIC FW
 ```
 
 ### NICFirmwareTemplate

api/v1alpha1/nicfirmwaresource_types.go

@@ -18,11 +18,15 @@ package v1alpha1
 import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 // NicFirmwareSourceSpec represents a list of url sources for FW
+// +kubebuilder:validation:XValidation:rule="size(self.binUrlSources) > 0 || size(self.bfbUrlSource) > 0",message="At least one of binUrlSources or bfbUrlSource must be specified"
 type NicFirmwareSourceSpec struct {
-	// BinUrlSources represents a list of url sources for FW
+	// BinUrlSources represents a list of url sources for ConnectX Firmware
 	// +kubebuilder:validation:MinItems=1
-	// +required
-	BinUrlSources []string `json:"binUrlSources"`
+	// +optional
+	BinUrlSources []string `json:"binUrlSources,omitempty"`
+	// BFBUrlSource represents a url source for BlueField Bundle
+	// +optional
+	BFBUrlSource string `json:"bfbUrlSource,omitempty"`
 }
 
 // NicFirmwareSourceStatus represents the status of the FW from given sources, e.g. version available for PSIDs
@@ -33,9 +37,11 @@ type NicFirmwareSourceStatus struct {
 	State string `json:"state"`
 	// Reason shows an error message if occurred
 	Reason string `json:"reason,omitempty"`
-	// Versions is a map of available FW versions to PSIDs
+	// Versions is a map of available FW binaries versions to PSIDs
 	// a PSID should have only a single FW version available for it
-	Versions map[string][]string `json:"versions,omitempty"`
+	BinaryVersions map[string][]string `json:"binaryVersions,omitempty"`
+	// BFBVersions represents the FW versions available in the provided BFB bundle
+	BFBVersions map[string]string `json:"bfbVersions,omitempty"`
 }
 
 //+kubebuilder:object:root=true

api/v1alpha1/zz_generated.deepcopy.go

@@ -119,7 +119,7 @@ func main() {
 
 	configurationManager := configuration.NewConfigurationManager(eventRecorder, dmsManager)
 	maintenanceManager := maintenance.New(mgr.GetClient(), hostUtils, nodeName, namespace)
-	firmwareManager := firmware.NewFirmwareManager(mgr.GetClient(), namespace)
+	firmwareManager := firmware.NewFirmwareManager(mgr.GetClient(), dmsManager, namespace)
 
 	if err := initNicFwMap(namespace); err != nil {
 		log.Log.Error(err, "unable to init NicFwMap")

cmd/nic-configuration-daemon/main.go

@@ -40,19 +40,39 @@ spec:
             description: NicFirmwareSourceSpec represents a list of url sources for
               FW
             properties:
+              bfbUrlSource:
+                description: BFBUrlSource represents a url source for BlueField Bundle
+                type: string
               binUrlSources:
-                description: BinUrlSources represents a list of url sources for FW
+                description: BinUrlSources represents a list of url sources for ConnectX
+                  Firmware
                 items:
                   type: string
                 minItems: 1
                 type: array
-            required:
-            - binUrlSources
             type: object
+            x-kubernetes-validations:
+            - message: At least one of binUrlSources or bfbUrlSource must be specified
+              rule: size(self.binUrlSources) > 0 || size(self.bfbUrlSource) > 0
           status:
             description: NicFirmwareSourceStatus represents the status of the FW from
               given sources, e.g. version available for PSIDs
             properties:
+              bfbVersions:
+                additionalProperties:
+                  type: string
+                description: BFBVersions represents the FW versions available in the
+                  provided BFB bundle
+                type: object
+              binaryVersions:
+                additionalProperties:
+                  items:
+                    type: string
+                  type: array
+                description: |-
+                  Versions is a map of available FW binaries versions to PSIDs
+                  a PSID should have only a single FW version available for it
+                type: object
               reason:
                 description: Reason shows an error message if occurred
                 type: string
@@ -66,15 +86,6 @@ spec:
                 - DownloadFailed
                 - CacheVerificationFailed
                 type: string
-              versions:
-                additionalProperties:
-                  items:
-                    type: string
-                  type: array
-                description: |-
-                  Versions is a map of available FW versions to PSIDs
-                  a PSID should have only a single FW version available for it
-                type: object
             required:
             - state
             type: object

config/crd/bases/configuration.net.nvidia.com_nicfirmwaresources.yaml

@@ -40,19 +40,39 @@ spec:
             description: NicFirmwareSourceSpec represents a list of url sources for
               FW
             properties:
+              bfbUrlSource:
+                description: BFBUrlSource represents a url source for BlueField Bundle
+                type: string
               binUrlSources:
-                description: BinUrlSources represents a list of url sources for FW
+                description: BinUrlSources represents a list of url sources for ConnectX
+                  Firmware
                 items:
                   type: string
                 minItems: 1
                 type: array
-            required:
-            - binUrlSources
             type: object
+            x-kubernetes-validations:
+            - message: At least one of binUrlSources or bfbUrlSource must be specified
+              rule: size(self.binUrlSources) > 0 || size(self.bfbUrlSource) > 0
           status:
             description: NicFirmwareSourceStatus represents the status of the FW from
               given sources, e.g. version available for PSIDs
             properties:
+              bfbVersions:
+                additionalProperties:
+                  type: string
+                description: BFBVersions represents the FW versions available in the
+                  provided BFB bundle
+                type: object
+              binaryVersions:
+                additionalProperties:
+                  items:
+                    type: string
+                  type: array
+                description: |-
+                  Versions is a map of available FW binaries versions to PSIDs
+                  a PSID should have only a single FW version available for it
+                type: object
               reason:
                 description: Reason shows an error message if occurred
                 type: string
@@ -66,15 +86,6 @@ spec:
                 - DownloadFailed
                 - CacheVerificationFailed
                 type: string
-              versions:
-                additionalProperties:
-                  items:
-                    type: string
-                  type: array
-                description: |-
-                  Versions is a map of available FW versions to PSIDs
-                  a PSID should have only a single FW version available for it
-                type: object
             required:
             - state
             type: object