Skip to content

Commit 7d898bc

Browse files
authored
fix: use mofed.wait=false nodeSelector for nic config daemon (#1805)
+ some wording fixes in docs
2 parents 4fd102d + 85c274d commit 7d898bc

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

api/v1alpha1/nicclusterpolicy_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ type DOCATelemetryServiceSpec struct {
293293
// NicFirmwareStorageSpec contains configuration for the NIC firmware storage
294294
type NicFirmwareStorageSpec struct {
295295
// Create specifies whether to create a new PVC or use an existing one
296-
// If create == false, the existing PVC should be located in the same namespace as the operator
296+
// If create == false, the existing PVC with the name specified in pvcName should be located in the same namespace as the operator
297297
// +kubebuilder:default:=true
298298
Create bool `json:"create,omitempty"`
299299
// PVCName is the name of the PVC to mount as NIC Firmware storage. Default value: "nic-fw-storage-pvc"
@@ -322,7 +322,7 @@ type NicConfigurationOperatorSpec struct {
322322
Operator *ImageSpec `json:"operator"`
323323
// Image information for nic-configuration-daemon
324324
ConfigurationDaemon *ImageSpec `json:"configurationDaemon"`
325-
// NicFirmwareStorage contains configuration for the NIC firmware storage
325+
// NicFirmwareStorage contains configuration for the NIC firmware storage. If not provided, the NIC firmware storage will not be configured.
326326
NicFirmwareStorage *NicFirmwareStorageSpec `json:"nicFirmwareStorage,omitempty"`
327327
// LogLevel sets the verbosity level of the logs. info|debug
328328
// +kubebuilder:validation:Enum={"info", "debug"}

config/crd/bases/mellanox.com_nicclusterpolicies.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,8 @@ spec:
535535
type: string
536536
nicFirmwareStorage:
537537
description: NicFirmwareStorage contains configuration for the
538-
NIC firmware storage
538+
NIC firmware storage. If not provided, the NIC firmware storage
539+
will not be configured.
539540
properties:
540541
availableStorageSize:
541542
default: 1Gi
@@ -552,7 +553,7 @@ spec:
552553
default: true
553554
description: |-
554555
Create specifies whether to create a new PVC or use an existing one
555-
If create == false, the existing PVC should be located in the same namespace as the operator
556+
If create == false, the existing PVC with the name specified in pvcName should be located in the same namespace as the operator
556557
type: boolean
557558
pvcName:
558559
default: nic-fw-storage-pvc

deployment/network-operator/crds/mellanox.com_nicclusterpolicies.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,8 @@ spec:
535535
type: string
536536
nicFirmwareStorage:
537537
description: NicFirmwareStorage contains configuration for the
538-
NIC firmware storage
538+
NIC firmware storage. If not provided, the NIC firmware storage
539+
will not be configured.
539540
properties:
540541
availableStorageSize:
541542
default: 1Gi
@@ -552,7 +553,7 @@ spec:
552553
default: true
553554
description: |-
554555
Create specifies whether to create a new PVC or use an existing one
555-
If create == false, the existing PVC should be located in the same namespace as the operator
556+
If create == false, the existing PVC with the name specified in pvcName should be located in the same namespace as the operator
556557
type: boolean
557558
pvcName:
558559
default: nic-fw-storage-pvc

manifests/state-nic-configuration-operator/070-config-daemon.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ spec:
2626
operator: Exists
2727
effect: NoSchedule
2828
hostNetwork: true
29+
nodeSelector:
30+
# We need to run it after the DOCA driver is started to be able to successfully configure RoCE settings.
31+
network.nvidia.com/operator.mofed.wait: "false"
2932
hostPID: true
3033
priorityClassName: system-node-critical
3134
{{- if .NodeAffinity }}

0 commit comments

Comments
 (0)