chore: DOCA-OFED Driver container doca3.1.0-25.07-0.6.6.0-0 (#1552)

Author: e0ne

Makefile

@@ -423,7 +423,7 @@ release-build:
 
 .PHONY: check-doca-drivers
 check-doca-drivers: $(HACKTMPDIR)
-	$(eval DRIVERVERSION := $(shell yq '.Mofed.version'  hack/release.yaml | cut -d'-' -f1))
+	$(eval DRIVERVERSION := $(shell yq '.Mofed.version'  hack/release.yaml | sed 's/^doca[0-9]\+\.[0-9]\+\.0-//' | cut -d'-' -f1))
 	wget $(DOCA_DRIVER_RELEASE_URL)$(DRIVERVERSION).yaml  -O $(HACKTMPDIR)/doca-driver-matrix.yaml
 	cd hack && $(GO) run release.go --doca-driver-check --doca-driver-matrix $(HACKTMPDIR)/doca-driver-matrix.yaml
 

api/v1alpha1/validator/nicclusterpolicy_webhook.go

@@ -468,7 +468,7 @@ func (ofedSpec *ofedDriverSpecWrapper) validateVersion(fldPath *field.Path) fiel
 	// Perform version validation logic here
 	if !isValidOFEDVersion(ofedSpec.Version) {
 		allErrs = append(allErrs, field.Invalid(fldPath.Child("version"), ofedSpec.Version,
-			`invalid OFED version, the regex used for validation is ^(\d+\.\d+-\d+(\.\d+)*)$ `))
+			`invalid OFED version, supported formats: "23.10-0.2.2.0", "24.01-0.3.3.1-0", "doca3.1-24.01-0.3.3.1-0"`))
 	}
 	return allErrs
 }
@@ -717,7 +717,11 @@ func validateResources(resources map[v1.ResourceName]apiresource.Quantity, allEr
 
 // isValidOFEDVersion is a custom function to validate OFED version
 func isValidOFEDVersion(version string) bool {
-	versionPattern := `^(\d+\.\d+-\d+(\.\d+)*(-\d+)?)$`
+	// Support multiple OFED version formats:
+	// 1. Old scheme: "23.10-0.2.2.0" or "23.10-0.2.2.0.1"
+	// 2. New scheme: "24.01-0.3.3.1-0"
+	// 3. DOCA prefix: "doca3.1-24.01-0.3.3.1-0"
+	versionPattern := `^(doca\d+\.\d+-\d+\.\d+-\d+\.\d+\.\d+\.\d+-\d+|\d+\.\d+-\d+(\.\d+)*(-\d+)?)$`
 	versionRegex := regexp.MustCompile(versionPattern)
 	return versionRegex.MatchString(version)
 }

api/v1alpha1/validator/nicclusterpolicy_webhook_test.go

@@ -136,6 +136,24 @@ var _ = Describe("Validate", func() {
 			_, err := validator.ValidateCreate(context.TODO(), nicClusterPolicy)
 			Expect(err).NotTo(HaveOccurred())
 		})
+		It("Valid MOFED version (with doca prefix)", func() {
+			validator := nicClusterPolicyValidator{}
+			nicClusterPolicy := &v1alpha1.NicClusterPolicy{
+				ObjectMeta: metav1.ObjectMeta{Name: "test"},
+				Spec: v1alpha1.NicClusterPolicySpec{
+					OFEDDriver: &v1alpha1.OFEDDriverSpec{
+						ImageSpec: v1alpha1.ImageSpec{
+							Image:            "mofed",
+							Repository:       "ghcr.io/mellanox",
+							Version:          "doca3.1-24.01-0.3.3.1-0",
+							ImagePullSecrets: []string{},
+						},
+					},
+				},
+			}
+			_, err := validator.ValidateCreate(context.TODO(), nicClusterPolicy)
+			Expect(err).NotTo(HaveOccurred())
+		})
 		It("Valid MOFED version", func() {
 			validator := nicClusterPolicyValidator{}
 			nicClusterPolicy := &v1alpha1.NicClusterPolicy{

example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-full-ocp.yaml

@@ -24,7 +24,7 @@ spec:
   ofedDriver:
     image: doca-driver
     repository: nvcr.io/nvstaging/mellanox
-    version: 25.04-0.6.1.0-2
+    version: doca3.1.0-25.07-0.6.6.0-0
     upgradePolicy:
       autoUpgrade: true
       drain:

example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-full.yaml

@@ -24,7 +24,7 @@ spec:
   ofedDriver:
     image: doca-driver
     repository: nvcr.io/nvstaging/mellanox
-    version: 25.04-0.6.1.0-2
+    version: doca3.1.0-25.07-0.6.6.0-0
     upgradePolicy:
       autoUpgrade: true
       drain:

example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ipoib.yaml

@@ -19,7 +19,7 @@ spec:
   ofedDriver:
     image: doca-driver
     repository: nvcr.io/nvstaging/mellanox
-    version: 25.04-0.6.1.0-2
+    version: doca3.1.0-25.07-0.6.6.0-0
     upgradePolicy:
       autoUpgrade: true
       drain:

example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-nvidia-ipam.yaml

@@ -19,7 +19,7 @@ spec:
   ofedDriver:
     image: doca-driver
     repository: nvcr.io/nvstaging/mellanox
-    version: 25.04-0.6.1.0-2
+    version: doca3.1.0-25.07-0.6.6.0-0
     upgradePolicy:
       autoUpgrade: true
       drain:

example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ocp-hostdev.yaml

@@ -19,7 +19,7 @@ spec:
   ofedDriver:
     image: doca-driver
     repository: nvcr.io/nvstaging/mellanox
-    version: 25.04-0.6.1.0-2
+    version: doca3.1.0-25.07-0.6.6.0-0
     upgradePolicy:
       autoUpgrade: true
       drain:

example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ocp.yaml

@@ -19,7 +19,7 @@ spec:
   ofedDriver:
     image: doca-driver
     repository: nvcr.io/nvstaging/mellanox
-    version: 25.04-0.6.1.0-2
+    version: doca3.1.0-25.07-0.6.6.0-0
     upgradePolicy:
       autoUpgrade: true
       drain:

example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr.yaml

@@ -19,7 +19,7 @@ spec:
   ofedDriver:
     image: doca-driver
     repository: nvcr.io/nvstaging/mellanox
-    version: 25.04-0.6.1.0-2
+    version: doca3.1.0-25.07-0.6.6.0-0
     upgradePolicy:
       autoUpgrade: true
       drain: