Merge branch 'master' into feature/update-Mellanox/ib-sriov-cni-tags-to-network-operator-v25.7.0-beta.1

Author: rollandf

deployment/network-operator/values.yaml

@@ -157,9 +157,9 @@ sriov-network-operator:
   images:
     operator: nvcr.io/nvstaging/mellanox/sriov-network-operator:4225daf
     sriovConfigDaemon: nvcr.io/nvstaging/mellanox/sriov-network-operator-config-daemon:4225daf
-    sriovCni: ghcr.io/k8snetworkplumbingwg/sriov-cni:v2.8.1
+    sriovCni: nvcr.io/nvstaging/mellanox/sriov-cni:network-operator-v25.7.0-beta.1
     ibSriovCni: nvcr.io/nvstaging/mellanox/ib-sriov-cni:network-operator-v25.7.0-beta.1
-    ovsCni: ghcr.io/k8snetworkplumbingwg/ovs-cni-plugin:v0.38.2
+    ovsCni: nvcr.io/nvstaging/mellanox/ovs-cni-plugin:network-operator-v25.7.0-beta.1
     # rdmaCni: nvcr.io/nvstaging/mellanox/rdma-cni:network-operator-v25.7.0-beta.1
     sriovDevicePlugin: nvcr.io/nvstaging/mellanox/sriov-network-device-plugin:network-operator-v25.7.0-beta.1
     resourcesInjector: ghcr.io/k8snetworkplumbingwg/network-resources-injector:v1.7.0

example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-full.yaml

@@ -81,16 +81,16 @@ spec:
   secondaryNetwork:
     cniPlugins:
       image: plugins
-      repository: ghcr.io/k8snetworkplumbingwg
-      version: v1.6.2-update.1
+      repository: nvcr.io/nvstaging/mellanox
+      version: network-operator-v25.7.0-beta.1
     ipoib:
       image: ipoib-cni
       repository: nvcr.io/nvstaging/mellanox
       version: network-operator-v25.7.0-beta.1
     multus:
       image: multus-cni
-      repository: ghcr.io/k8snetworkplumbingwg
-      version: v4.1.0
+      repository: nvcr.io/nvstaging/mellanox
+      version: network-operator-v25.7.0-beta.1
     ipamPlugin:
       image: whereabouts
       repository: nvcr.io/nvstaging/mellanox

example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ipoib.yaml

@@ -59,16 +59,16 @@ spec:
   secondaryNetwork:
     cniPlugins:
       image: plugins
-      repository: ghcr.io/k8snetworkplumbingwg
-      version: v1.6.2-update.1
+      repository: nvcr.io/nvstaging/mellanox
+      version: network-operator-v25.7.0-beta.1
     ipoib:
       image: ipoib-cni
       repository: nvcr.io/nvstaging/mellanox
       version: network-operator-v25.7.0-beta.1
     multus:
       image: multus-cni
-      repository: ghcr.io/k8snetworkplumbingwg
-      version: v4.1.0
+      repository: nvcr.io/nvstaging/mellanox
+      version: network-operator-v25.7.0-beta.1
     ipamPlugin:
       image: whereabouts
       repository: nvcr.io/nvstaging/mellanox

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

@@ -59,12 +59,12 @@ spec:
   secondaryNetwork:
     cniPlugins:
       image: plugins
-      repository: ghcr.io/k8snetworkplumbingwg
-      version: v1.6.2-update.1
+      repository: nvcr.io/nvstaging/mellanox
+      version: network-operator-v25.7.0-beta.1
     multus:
       image: multus-cni
-      repository: ghcr.io/k8snetworkplumbingwg
-      version: v4.1.0
+      repository: nvcr.io/nvstaging/mellanox
+      version: network-operator-v25.7.0-beta.1
   nvIpam:
     image: nvidia-k8s-ipam
     repository: nvcr.io/nvstaging/mellanox

example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr.yaml

@@ -59,12 +59,12 @@ spec:
   secondaryNetwork:
     cniPlugins:
       image: plugins
-      repository: ghcr.io/k8snetworkplumbingwg
-      version: v1.6.2-update.1
+      repository: nvcr.io/nvstaging/mellanox
+      version: network-operator-v25.7.0-beta.1
     multus:
       image: multus-cni
-      repository: ghcr.io/k8snetworkplumbingwg
-      version: v4.1.0
+      repository: nvcr.io/nvstaging/mellanox
+      version: network-operator-v25.7.0-beta.1
     ipamPlugin:
       image: whereabouts
       repository: nvcr.io/nvstaging/mellanox

hack/release.yaml

@@ -21,9 +21,9 @@ SriovConfigDaemon:
   version: 4225daf
 SriovCni:
   image: sriov-cni
-  repository: ghcr.io/k8snetworkplumbingwg
+  repository: nvcr.io/nvstaging/mellanox
   sourceRepository: sriov-cni
-  version: v2.8.1
+  version: network-operator-v25.7.0-beta.1
 SriovIbCni:
   image: ib-sriov-cni
   repository: nvcr.io/nvstaging/mellanox
@@ -50,14 +50,14 @@ IbKubernetes:
   version: network-operator-v25.7.0-beta.1
 CniPlugins:
   image: plugins
-  repository: ghcr.io/k8snetworkplumbingwg
+  repository: nvcr.io/nvstaging/mellanox
   sourceRepository: k8snetworkplumbingwg-plugins
-  version: v1.6.2-update.1
+  version: network-operator-v25.7.0-beta.1
 Multus:
   image: multus-cni
-  repository: ghcr.io/k8snetworkplumbingwg
+  repository: nvcr.io/nvstaging/mellanox
   sourceRepository: multus-cni
-  version: v4.1.0
+  version: network-operator-v25.7.0-beta.1
 Ipoib:
   image: ipoib-cni
   repository: nvcr.io/nvstaging/mellanox
@@ -84,9 +84,9 @@ docaTelemetryService:
   version: 1.21.4-doca3.0.0-host
 ovsCni:
   image: ovs-cni-plugin
-  repository: ghcr.io/k8snetworkplumbingwg
+  repository: nvcr.io/nvstaging/mellanox
   sourceRepository: ovs-cni
-  version: v0.38.2
+  version: network-operator-v25.7.0-beta.1
 rdmaCni:
   image: rdma-cni
   repository: nvcr.io/nvstaging/mellanox