Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion docs/common/vars.rst
Original file line number Diff line number Diff line change
@@ -1,27 +1,50 @@
.. |network-operator-version| replace:: v25.7.0-beta.1
.. |network-operator-repository| replace:: nvcr.io/nvstaging/mellanox
.. |helm-chart-version| replace:: 25.7.0-beta.1
.. |ocp-channel| replace:: v25.7
.. |doca-driver-version| replace:: 25.04-0.6.1.0-2
.. |doca-driver-repository| replace:: nvcr.io/nvstaging/mellanox
.. |doca-driver-version-lts| replace:: 24.10-0.7.0.0-0
.. |doca-init-container-version| replace:: v0.0.3
.. |doca-init-container-repository| replace:: ghcr.io/mellanox
.. |sriov-device-plugin-version| replace:: network-operator-v25.7.0-beta.1
.. |sriov-device-plugin-repository| replace:: nvcr.io/nvstaging/mellanox
.. |k8s-rdma-shared-dev-plugin-version| replace:: network-operator-v25.7.0-beta.1
.. |k8s-rdma-shared-dev-plugin-repository| replace:: nvcr.io/nvstaging/mellanox
.. |ib-kubernetes-version| replace:: network-operator-v25.7.0-beta.1
.. |ib-kubernetes-repository| replace:: nvcr.io/nvstaging/mellanox
.. |cni-plugins-version| replace:: network-operator-v25.7.0-beta.1
.. |cni-plugins-repository| replace:: nvcr.io/nvstaging/mellanox
.. |multus-version| replace:: network-operator-v25.7.0-beta.1
.. |multus-repository| replace:: nvcr.io/nvstaging/mellanox
.. |ipoib-cni-version| replace:: network-operator-v25.7.0-beta.1
.. |ipoib-cni-repository| replace:: nvcr.io/nvstaging/mellanox
.. |whereabouts-version| replace:: network-operator-v25.7.0-beta.1
.. |whereabouts-repository| replace:: nvcr.io/nvstaging/mellanox
.. |nvidia-ipam-version| replace:: network-operator-v25.7.0-beta.1
.. |nvidia-ipam-repository| replace:: nvcr.io/nvstaging/mellanox
.. |nic-feature-discovery-version| replace:: network-operator-v25.7.0-beta.1
.. |nic-feature-discovery-repository| replace:: nvcr.io/nvstaging/mellanox
.. |sriovnetop-version| replace:: network-operator-25.4.0
.. |sriovnetop-repository| replace:: nvcr.io/nvidia/mellanox
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is it pointing to public repo? do we need to fix release.yaml?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The values are from hack/release.yaml in master

.. |sriovnetop-sriov-cni-version| replace:: network-operator-v25.7.0-beta.1
.. |sriovnetop-sriov-cni-repository| replace:: nvcr.io/nvstaging/mellanox
.. |sriovnetop-ib-sriov-cni-version| replace:: network-operator-v25.7.0-beta.1
.. |sriovnetop-ib-sriov-cni-repository| replace:: nvcr.io/nvstaging/mellanox
.. |sriovnetop-sriov-device-plugin-version| replace:: network-operator-v25.7.0-beta.1
.. |sriovnetop-sriov-device-plugin-repository| replace:: nvcr.io/nvstaging/mellanox
.. |doca-telemetry-version| replace:: 1.21.4-doca3.0.0-host
.. |node-feature-discovery-version| replace:: v0.15.6
.. |doca-telemetry-repository| replace:: nvcr.io/nvidia/doca
.. |node-feature-discovery-version| replace:: v0.17.0
.. |node-feature-discovery-repository| replace:: registry.k8s.io/nfd
.. |doca-driver-build-commit| replace:: f5de72596d639bc369566676038ac251c9575ca3
.. |nic-configuration-operator-version| replace:: v1.0.3
.. |nic-configuration-operator-repository| replace:: ghcr.io/mellanox
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is still pointing to ghcr

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The values are from hack/release.yaml in master

.. |maintenance-operator-version| replace:: network-operator-v25.7.0-beta.1
.. |maintenance-operator-repository| replace:: nvcr.io/nvstaging/mellanox
.. |ovs-cni-version| replace:: network-operator-v25.7.0-beta.1
.. |ovs-cni-repository| replace:: nvcr.io/nvstaging/mellanox
.. |rdma-cni-version| replace:: network-operator-v25.7.0-beta.1
.. |rdma-cni-repository| replace:: nvcr.io/nvstaging/mellanox
.. |spectrumxop-version| replace:: network-operator-v25.7.0-beta.1
.. |spectrumxop-repository| replace:: nvcr.io/nvstaging/mellanox
26 changes: 13 additions & 13 deletions docs/customizations/cr-full-example.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ This example should serve as a reference, it is not recommended to apply it as i
spec:
ofedDriver:
image: doca-driver
repository: nvcr.io/nvidia/mellanox
repository: |doca-driver-repository|
version: |doca-driver-version|
upgradePolicy:
autoUpgrade: true
Expand All @@ -59,7 +59,7 @@ This example should serve as a reference, it is not recommended to apply it as i
periodSeconds: 30
rdmaSharedDevicePlugin:
image: k8s-rdma-shared-dev-plugin
repository: ghcr.io/mellanox
repository: |k8s-rdma-shared-dev-plugin-repository|
version: |k8s-rdma-shared-dev-plugin-version|
# The config below directly propagates to k8s-rdma-shared-device-plugin configuration.
# Replace 'devices' with your (RDMA capable) netdevice name.
Expand All @@ -78,7 +78,7 @@ This example should serve as a reference, it is not recommended to apply it as i
}
sriovDevicePlugin:
image: sriov-network-device-plugin
repository: ghcr.io/k8snetworkplumbingwg
repository: |sriov-device-plugin-repository|
version: |sriov-device-plugin-version|
config: |
{
Expand All @@ -96,48 +96,48 @@ This example should serve as a reference, it is not recommended to apply it as i
secondaryNetwork:
cniPlugins:
image: plugins
repository: ghcr.io/k8snetworkplumbingwg
repository: |cni-plugins-repository|
version: |cni-plugins-version|
ipoib:
image: ipoib-cni
repository: ghcr.io/mellanox
repository: |ipoib-cni-repository|
version: |ipoib-cni-version|
multus:
image: multus-cni
repository: ghcr.io/k8snetworkplumbingwg
repository: |multus-repository|
version: |multus-version|
ipamPlugin:
image: whereabouts
repository: ghcr.io/k8snetworkplumbingwg
repository: |whereabouts-repository|
version: |whereabouts-version|
nvIpam:
image: nvidia-k8s-ipam
repository: ghcr.io/mellanox
repository: |nvidia-ipam-repository|
version: |nvidia-ipam-version|
enableWebhook: false
ibKubernetes:
image: ib-kubernetes
repository: ghcr.io/mellanox/ib-kubernetes
repository: |ib-kubernetes-repository|
version: |ib-kubernetes-version|
pKeyGUIDPoolRangeStart: "02:00:00:00:00:00:00:00"
pKeyGUIDPoolRangeEnd: "02:FF:FF:FF:FF:FF:FF:FF"
ufmSecret: ufm-secret
nicFeatureDiscovery:
image: nic-feature-discovery
repository: ghcr.io/mellanox
repository: |nic-feature-discovery-repository|
version: |nic-feature-discovery-version|
docaTelemetryService:
image: doca_telemetry
repository: nvcr.io/nvidia/doca
repository: |doca-telemetry-repository|
version: |doca-telemetry-version|
nicConfigurationOperator:
operator:
image: nic-configuration-operator
repository: ghcr.io/mellanox
repository: |nic-configuration-operator-repository|
version: |nic-configuration-operator-version|
configurationDaemon:
image: nic-configuration-operator-daemon
repository: ghcr.io/mellanox
repository: |nic-configuration-operator-repository|
version: |nic-configuration-operator-version|
nicFirmwareStorage:
create: true
Expand Down
Loading