Revendor nnf-ec and select strict allocation compliance type for unif…

…ormly sized namespaces on each drive. Signed-off-by: Anthony Floeder <[email protected]>
NearNodeFlash · Jan 13, 2025 · ed32418 · ed32418
1 parent 8a9a293
commit ed32418
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 16 deletions.
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.21
 require (
 	github.com/DataWorkflowServices/dws v0.0.1-0.20241029172011-d5898d0b8640
 	github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20241209183639-2d8fdbd63dec
-	github.com/NearNodeFlash/nnf-ec v0.0.1-0.20241205165035-51a536434b0d
+	github.com/NearNodeFlash/nnf-ec v0.0.1-0.20250113163425-2fd0825bc67c
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-logr/logr v1.4.1
 	github.com/google/go-cmp v0.6.0

diff --git a/go.sum b/go.sum
@@ -6,8 +6,8 @@ github.com/HewlettPackard/structex v1.0.4 h1:RVTdN5FWhDWr1IkjllU8wxuLjISo4gr6u5r
 github.com/HewlettPackard/structex v1.0.4/go.mod h1:3frC4RY/cPsP/4+N8rkxsNAGlQwHV+zDC7qvrN+N+rE=
 github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20241209183639-2d8fdbd63dec h1:LPeWeG5xeqixm1YfE26jY5mbhFS8jNkErrI+WmQLFgg=
 github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20241209183639-2d8fdbd63dec/go.mod h1:3JGfBMIfipAZbbAAesSvKzGmKGAh2Wu6pPGQWMP2f8w=
-github.com/NearNodeFlash/nnf-ec v0.0.1-0.20241205165035-51a536434b0d h1:s+zaQp8959Z1KjAo/zRP05CRJUrHTKx2ItbR4C3ffQw=
-github.com/NearNodeFlash/nnf-ec v0.0.1-0.20241205165035-51a536434b0d/go.mod h1:oxdwMqfttOF9dabJhqrWlirCnMk8/8eyLMwl+hducjk=
+github.com/NearNodeFlash/nnf-ec v0.0.1-0.20250113163425-2fd0825bc67c h1:zK1VlTmgsa+dhbLWOGaQ1GWyFeyv8jQmkiVq27VzGNc=
+github.com/NearNodeFlash/nnf-ec v0.0.1-0.20250113163425-2fd0825bc67c/go.mod h1:oxdwMqfttOF9dabJhqrWlirCnMk8/8eyLMwl+hducjk=
 github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=

diff --git a/internal/controller/nnf_node_block_storage_controller.go b/internal/controller/nnf_node_block_storage_controller.go
@@ -541,7 +541,7 @@ func (r *NnfNodeBlockStorageReconciler) createStoragePool(ss nnf.StorageServiceA
 		CapacityBytes: capacity,
 		Oem: openapi.MarshalOem(nnf.AllocationPolicyOem{
 			Policy:     nnf.SpareAllocationPolicyType,
-			Compliance: nnf.RelaxedAllocationComplianceType,
+			Compliance: nnf.StrictAllocationComplianceType,
 		}),
 	}
 

diff --git a/vendor/github.com/NearNodeFlash/nnf-ec/pkg/manager-nnf/allocation_policy.go b/vendor/github.com/NearNodeFlash/nnf-ec/pkg/manager-nnf/allocation_policy.go
diff --git a/vendor/github.com/NearNodeFlash/nnf-ec/pkg/manager-nnf/manager.go b/vendor/github.com/NearNodeFlash/nnf-ec/pkg/manager-nnf/manager.go
diff --git a/vendor/github.com/NearNodeFlash/nnf-ec/pkg/manager-nvme/manager.go b/vendor/github.com/NearNodeFlash/nnf-ec/pkg/manager-nvme/manager.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -16,7 +16,7 @@ github.com/HewlettPackard/structex
 github.com/NearNodeFlash/lustre-fs-operator/api/v1beta1
 github.com/NearNodeFlash/lustre-fs-operator/config/crd/bases
 github.com/NearNodeFlash/lustre-fs-operator/config/webhook
-# github.com/NearNodeFlash/nnf-ec v0.0.1-0.20241205165035-51a536434b0d
+# github.com/NearNodeFlash/nnf-ec v0.0.1-0.20250113163425-2fd0825bc67c
 ## explicit; go 1.19
 github.com/NearNodeFlash/nnf-ec/internal/switchtec/pkg/nvme
 github.com/NearNodeFlash/nnf-ec/internal/switchtec/pkg/switchtec