Skip to content

Commit b821c79

Browse files
rollandfrollandf
authored
Merge pull request Mellanox#263 from rollandf/25.10-beta.1
chore: 25.7.0 beta1
2 parents ee5c41e + dad3d43 commit b821c79

File tree

21 files changed

+394
-380
lines changed

21 files changed

+394
-380
lines changed

‎docs/advanced/images-sha256.rst‎

Lines changed: 169 additions & 138 deletions
Large diffs are not rendered by default.

‎docs/common/vars.rst‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
1-
.. |network-operator-version| replace:: v25.7.0
2-
.. |network-operator-repository| replace:: nvcr.io/nvidia/cloud-native
3-
.. |helm-chart-version| replace:: 25.7.0
4-
.. |doca-driver-version| replace:: doca3.1.0-25.07-0.9.7.0-0
5-
.. |doca-driver-repository| replace:: nvcr.io/nvidia/mellanox
1+
.. |network-operator-version| replace:: v25.10.0-beta.1
2+
.. |network-operator-repository| replace:: nvcr.io/nvstaging/mellanox
3+
.. |helm-chart-version| replace:: 25.10.0-beta.1
4+
.. |doca-driver-version| replace:: doca3.2.0-25.10-0.4.2.0-0
5+
.. |doca-driver-repository| replace:: nvcr.io/nvstaging/mellanox
66
.. |doca-driver-version-lts| replace:: 24.10-0.7.0.0-0
7-
.. |doca-init-container-version| replace:: network-operator-v25.7.0
8-
.. |doca-init-container-repository| replace:: nvcr.io/nvidia/mellanox
9-
.. |sriov-device-plugin-version| replace:: network-operator-v25.7.0
10-
.. |sriov-device-plugin-repository| replace:: nvcr.io/nvidia/mellanox
11-
.. |k8s-rdma-shared-dev-plugin-version| replace:: network-operator-v25.7.0
12-
.. |k8s-rdma-shared-dev-plugin-repository| replace:: nvcr.io/nvidia/mellanox
13-
.. |ib-kubernetes-version| replace:: network-operator-v25.7.0
14-
.. |ib-kubernetes-repository| replace:: nvcr.io/nvidia/mellanox
15-
.. |cni-plugins-version| replace:: network-operator-v25.7.0
16-
.. |cni-plugins-repository| replace:: nvcr.io/nvidia/mellanox
17-
.. |multus-version| replace:: network-operator-v25.7.0
18-
.. |multus-repository| replace:: nvcr.io/nvidia/mellanox
19-
.. |ipoib-cni-version| replace:: network-operator-v25.7.0
20-
.. |ipoib-cni-repository| replace:: nvcr.io/nvidia/mellanox
21-
.. |nvidia-ipam-version| replace:: network-operator-v25.7.0
22-
.. |nvidia-ipam-repository| replace:: nvcr.io/nvidia/mellanox
23-
.. |nic-feature-discovery-version| replace:: network-operator-v25.7.0
24-
.. |nic-feature-discovery-repository| replace:: nvcr.io/nvidia/mellanox
25-
.. |sriovnetop-version| replace:: network-operator-v25.7.0
26-
.. |sriovnetop-repository| replace:: nvcr.io/nvidia/mellanox
27-
.. |sriovnetop-sriov-cni-version| replace:: network-operator-v25.7.0
28-
.. |sriovnetop-sriov-cni-repository| replace:: nvcr.io/nvidia/mellanox
29-
.. |sriovnetop-ib-sriov-cni-version| replace:: network-operator-v25.7.0
30-
.. |sriovnetop-ib-sriov-cni-repository| replace:: nvcr.io/nvidia/mellanox
31-
.. |sriovnetop-sriov-device-plugin-version| replace:: network-operator-v25.7.0
32-
.. |sriovnetop-sriov-device-plugin-repository| replace:: nvcr.io/nvidia/mellanox
7+
.. |doca-init-container-version| replace:: network-operator-v25.10.0-beta.1
8+
.. |doca-init-container-repository| replace:: nvcr.io/nvstaging/mellanox
9+
.. |sriov-device-plugin-version| replace:: network-operator-v25.10.0-beta.1
10+
.. |sriov-device-plugin-repository| replace:: nvcr.io/nvstaging/mellanox
11+
.. |k8s-rdma-shared-dev-plugin-version| replace:: network-operator-v25.10.0-beta.1
12+
.. |k8s-rdma-shared-dev-plugin-repository| replace:: nvcr.io/nvstaging/mellanox
13+
.. |ib-kubernetes-version| replace:: network-operator-v25.10.0-beta.1
14+
.. |ib-kubernetes-repository| replace:: nvcr.io/nvstaging/mellanox
15+
.. |cni-plugins-version| replace:: network-operator-v25.10.0-beta.1
16+
.. |cni-plugins-repository| replace:: nvcr.io/nvstaging/mellanox
17+
.. |multus-version| replace:: network-operator-v25.10.0-beta.1
18+
.. |multus-repository| replace:: nvcr.io/nvstaging/mellanox
19+
.. |ipoib-cni-version| replace:: network-operator-v25.10.0-beta.1
20+
.. |ipoib-cni-repository| replace:: nvcr.io/nvstaging/mellanox
21+
.. |nvidia-ipam-version| replace:: network-operator-v25.10.0-beta.1
22+
.. |nvidia-ipam-repository| replace:: nvcr.io/nvstaging/mellanox
23+
.. |nic-feature-discovery-version| replace:: network-operator-v25.10.0-beta.1
24+
.. |nic-feature-discovery-repository| replace:: nvcr.io/nvstaging/mellanox
25+
.. |sriovnetop-version| replace:: network-operator-v25.10.0-beta.1
26+
.. |sriovnetop-repository| replace:: nvcr.io/nvstaging/mellanox
27+
.. |sriovnetop-sriov-cni-version| replace:: network-operator-v25.10.0-beta.1
28+
.. |sriovnetop-sriov-cni-repository| replace:: nvcr.io/nvstaging/mellanox
29+
.. |sriovnetop-ib-sriov-cni-version| replace:: network-operator-v25.10.0-beta.1
30+
.. |sriovnetop-ib-sriov-cni-repository| replace:: nvcr.io/nvstaging/mellanox
31+
.. |sriovnetop-sriov-device-plugin-version| replace:: network-operator-v25.10.0-beta.1
32+
.. |sriovnetop-sriov-device-plugin-repository| replace:: nvcr.io/nvstaging/mellanox
3333
.. |doca-telemetry-version| replace:: 1.21.4-doca3.0.0-host
3434
.. |doca-telemetry-repository| replace:: nvcr.io/nvidia/doca
35-
.. |node-feature-discovery-version| replace:: network-operator-v25.7.0
36-
.. |node-feature-discovery-repository| replace:: nvcr.io/nvidia/mellanox
37-
.. |doca-driver-build-commit| replace:: ebde0772891747a60bdf471a92228de8ba54b62c
38-
.. |nic-configuration-operator-version| replace:: network-operator-v25.7.0
39-
.. |nic-configuration-operator-repository| replace:: nvcr.io/nvidia/mellanox
40-
.. |maintenance-operator-version| replace:: network-operator-v25.7.0
41-
.. |maintenance-operator-repository| replace:: nvcr.io/nvidia/mellanox
42-
.. |ovs-cni-version| replace:: network-operator-v25.7.0
43-
.. |ovs-cni-repository| replace:: nvcr.io/nvidia/mellanox
44-
.. |rdma-cni-version| replace:: network-operator-v25.7.0
45-
.. |rdma-cni-repository| replace:: nvcr.io/nvidia/mellanox
46-
.. |spectrumxop-version| replace:: network-operator-v25.7.0
47-
.. |spectrumxop-repository| replace:: nvcr.io/nvidia/mellanox
35+
.. |node-feature-discovery-version| replace:: network-operator-v25.10.0-beta.1
36+
.. |node-feature-discovery-repository| replace:: nvcr.io/nvstaging/mellanox
37+
.. |doca-driver-build-commit| replace:: e64cc045adc3bbf0ab104d3f29a5f02e98919645
38+
.. |nic-configuration-operator-version| replace:: network-operator-v25.10.0-beta.1
39+
.. |nic-configuration-operator-repository| replace:: nvcr.io/nvstaging/mellanox
40+
.. |maintenance-operator-version| replace:: network-operator-v25.10.0-beta.1
41+
.. |maintenance-operator-repository| replace:: nvcr.io/nvstaging/mellanox
42+
.. |ovs-cni-version| replace:: network-operator-v25.10.0-beta.1
43+
.. |ovs-cni-repository| replace:: nvcr.io/nvstaging/mellanox
44+
.. |rdma-cni-version| replace:: network-operator-v25.10.0-beta.1
45+
.. |rdma-cni-repository| replace:: nvcr.io/nvstaging/mellanox
46+
.. |spectrumxop-version| replace:: network-operator-v25.10.0-beta.1
47+
.. |spectrumxop-repository| replace:: nvcr.io/nvstaging/mellanox

‎docs/customizations/crds.rst‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,8 @@ NicClusterPolicySpec defines the desired state of NicClusterPolicy
654654
| ``secondaryNetwork`` | SecondaryNetwork Specifies components to deploy in order to facilitate a secondary network in |
655655
| :ref:`SecondaryNetworkSpec <SecondaryNetworkSpec>` | Kubernetes. It consists of the following optionally deployed components: - Multus-CNI: Delegate |
656656
| | CNI plugin to support secondary networks in Kubernetes - CNI plugins: Currently only |
657-
| | containernetworking-plugins is supported |
657+
| | containernetworking-plugins is supported - IPoIB CNI: Allows the user to create IPoIB child link |
658+
| | and move it to the pod |
658659
+---------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------+
659660
| ``nvIpam`` | NvIpam is an IPAM provider that dynamically assigns IP addresses with speed and performance in |
660661
| :ref:`NVIPAMSpec <NVIPAMSpec>` | mind. Note: NvIPam requires certificate management e.g. cert-manager or OpenShift cert |
@@ -897,9 +898,6 @@ SecondaryNetworkSpec describes configuration options for secondary network
897898
| ``ipoib`` | Image information for IPoIB CNI |
898899
| :ref:`ImageSpec <ImageSpec>` | |
899900
+---------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------+
900-
| ``ipamPlugin`` | Image information for IPAM plugin Deprecated: This field is deprecated and will be removed in a |
901-
| :ref:`ImageSpec <ImageSpec>` | future version. Use ‘nvIpam’ instead. |
902-
+---------------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------+
903901

904902
.. _SpectrumXOperatorSpec:
905903

‎docs/customizations/helm.rst‎

Lines changed: 15 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,6 @@ General Parameters
5858
- bool
5959
- `true`
6060
- Deploy Node Feature Discovery operator.
61-
* - nicConfigurationOperator
62-
- object
63-
- `{"enabled":false}`
64-
- NIC Configuration Operator helm chart is deprecated and will be deleted in future releases. Use NIC Cluster Policy to deploy the NIC Configuration Operator instead.
65-
* - nicConfigurationOperator.enabled
66-
- bool
67-
- `false`
68-
- Deploy NIC Configuration Operator.
6961
* - operator.admissionController.enabled
7062
- bool
7163
- `false`
@@ -111,7 +103,7 @@ General Parameters
111103
- Network Operator image name
112104
* - operator.maintenanceOperator
113105
- object
114-
- `{"nodeMaintenanceNamePrefix":"network-operator","nodeMaintenanceNamespace":"default","requestorID":"nvidia.network.operator","useRequestor":false}`
106+
- `{"drainControllerRequestorID":"nvidia.network-operator-drain-controller","nodeMaintenanceNamePrefix":"network-operator","nodeMaintenanceNamespace":"default","requestorID":"nvidia.network-operator-driver-upgrade-controller","useDrainControllerRequestor":false,"useRequestor":false}`
115107
- Enable the use of maintenance operator upgrade logic.
116108
* - operator.nameOverride
117109
- string
@@ -131,15 +123,15 @@ General Parameters
131123
- Init container image name.
132124
* - operator.ofedDriver.initContainer.repository
133125
- string
134-
- `"nvcr.io/nvidia/mellanox"`
126+
- `"nvcr.io/nvstaging/mellanox"`
135127
- Init container image repository.
136128
* - operator.ofedDriver.initContainer.version
137129
- string
138-
- `"network-operator-v25.7.0"`
130+
- `"network-operator-v25.10.0-beta.1"`
139131
- Init container image version.
140132
* - operator.repository
141133
- string
142-
- `"nvcr.io/nvidia/cloud-native"`
134+
- `"nvcr.io/nvstaging/mellanox"`
143135
- Network Operator image repository.
144136
* - operator.resources
145137
- yaml
@@ -251,11 +243,11 @@ Node Feature Discovery Helm chart customization options can be found `here <http
251243
-
252244
* - node-feature-discovery.image.repository
253245
- string
254-
- `"nvcr.io/nvidia/mellanox/node-feature-discovery"`
246+
- `"nvcr.io/nvstaging/mellanox/node-feature-discovery"`
255247
-
256248
* - node-feature-discovery.image.tag
257249
- string
258-
- `"network-operator-v25.7.0"`
250+
- `"network-operator-v25.10.0-beta.1"`
259251
-
260252
* - node-feature-discovery.master
261253
- yaml
@@ -317,35 +309,35 @@ SR-IOV Network Operator Helm chart customization options can be found `here <htt
317309
- Notes
318310
* - sriov-network-operator.images.ibSriovCni
319311
- string
320-
- `"nvcr.io/nvidia/mellanox/ib-sriov-cni:network-operator-v25.7.0"`
312+
- `"nvcr.io/nvstaging/mellanox/ib-sriov-cni:network-operator-v25.10.0-beta.1"`
321313
-
322314
* - sriov-network-operator.images.operator
323315
- string
324-
- `"nvcr.io/nvidia/mellanox/sriov-network-operator:network-operator-v25.7.0"`
316+
- `"nvcr.io/nvstaging/mellanox/sriov-network-operator:network-operator-v25.10.0-beta.1"`
325317
-
326318
* - sriov-network-operator.images.ovsCni
327319
- string
328-
- `"nvcr.io/nvidia/mellanox/ovs-cni-plugin:network-operator-v25.7.0"`
320+
- `"nvcr.io/nvstaging/mellanox/ovs-cni-plugin:network-operator-v25.10.0-beta.1"`
329321
-
330322
* - sriov-network-operator.images.resourcesInjector
331323
- string
332324
- `"ghcr.io/k8snetworkplumbingwg/network-resources-injector:v1.7.0"`
333325
-
334326
* - sriov-network-operator.images.sriovCni
335327
- string
336-
- `"nvcr.io/nvidia/mellanox/sriov-cni:network-operator-v25.7.0"`
328+
- `"nvcr.io/nvstaging/mellanox/sriov-cni:network-operator-v25.10.0-beta.1"`
337329
-
338330
* - sriov-network-operator.images.sriovConfigDaemon
339331
- string
340-
- `"nvcr.io/nvidia/mellanox/sriov-network-operator-config-daemon:network-operator-v25.7.0"`
332+
- `"nvcr.io/nvstaging/mellanox/sriov-network-operator-config-daemon:network-operator-v25.10.0-beta.1"`
341333
-
342334
* - sriov-network-operator.images.sriovDevicePlugin
343335
- string
344-
- `"nvcr.io/nvidia/mellanox/sriov-network-device-plugin:network-operator-v25.7.0"`
336+
- `"nvcr.io/nvstaging/mellanox/sriov-network-device-plugin:network-operator-v25.10.0-beta.1"`
345337
-
346338
* - sriov-network-operator.images.webhook
347339
- string
348-
- `"nvcr.io/nvidia/mellanox/sriov-network-operator-webhook:network-operator-v25.7.0"`
340+
- `"nvcr.io/nvstaging/mellanox/sriov-network-operator-webhook:network-operator-v25.10.0-beta.1"`
349341
-
350342
* - sriov-network-operator.operator.admissionControllers
351343
- yaml
@@ -430,44 +422,6 @@ SR-IOV Network Operator Helm chart customization options can be found `here <htt
430422
- `true`
431423
- Deploy ``SriovOperatorConfig`` custom resource
432424

433-
==========================
434-
NIC Configuration Operator
435-
==========================
436-
437-
NIC Configuration Operator Helm chart customization options can be found `here <https://github.com/Mellanox/nic-configuration-operator/blob/main/deployment/nic-configuration-operator-chart/README.md>`__. Following is a list of overriden values by NVIDIA Network Operator Helm Chart:
438-
439-
.. list-table::
440-
:header-rows: 1
441-
442-
* - Name
443-
- Type
444-
- Default in NVIDIA Network Operator
445-
- Notes
446-
* - nic-configuration-operator-chart.configDaemon.image.name
447-
- string
448-
- `"nic-configuration-operator-daemon"`
449-
-
450-
* - nic-configuration-operator-chart.configDaemon.image.repository
451-
- string
452-
- `"nvcr.io/nvidia/mellanox"`
453-
-
454-
* - nic-configuration-operator-chart.configDaemon.image.tag
455-
- string
456-
- `"network-operator-v25.7.0"`
457-
-
458-
* - nic-configuration-operator-chart.operator.image.name
459-
- string
460-
- `"nic-configuration-operator"`
461-
-
462-
* - nic-configuration-operator-chart.operator.image.repository
463-
- string
464-
- `"nvcr.io/nvidia/mellanox"`
465-
-
466-
* - nic-configuration-operator-chart.operator.image.tag
467-
- string
468-
- `"network-operator-v25.7.0"`
469-
-
470-
471425
====================
472426
Maintenance Operator
473427
====================
@@ -507,11 +461,11 @@ Maintenance Operator Helm chart customization options can be found `here <https:
507461
-
508462
* - maintenance-operator-chart.operator.image.repository
509463
- string
510-
- `"nvcr.io/nvidia/mellanox"`
464+
- `"nvcr.io/nvstaging/mellanox"`
511465
-
512466
* - maintenance-operator-chart.operator.image.tag
513467
- string
514-
- `"network-operator-v25.7.0"`
468+
- `"network-operator-v25.10.0-beta.1"`
515469
-
516470
* - maintenance-operator-chart.operatorConfig
517471
- object

‎docs/life-cycle-management.rst‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ Get the NicClusterPolicy status:
9595
state: ignore
9696
- name: state-ipoib-cni
9797
state: ignore
98-
- name: state-whereabouts-cni
99-
state: ready
10098
- name: state-OFED
10199
state: ready
102100
- name: state-SRIOV-device-plugin

0 commit comments

Comments
 (0)