Merge branch 'v24.1.x' into v24.1.1-ci-image-updater

Mellanox · Apr 4, 2024 · 82d5883 · 82d5883
2 parents 9d1332b + 9c5a9e0
commit 82d5883
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 22 deletions.
diff --git a/config/samples/mellanox.com_v1alpha1_nicclusterpolicy.yaml b/config/samples/mellanox.com_v1alpha1_nicclusterpolicy.yaml
@@ -18,8 +18,8 @@ metadata:
 spec:
   ofedDriver:
     image: doca-driver
-    repository: nvcr.io/nvstaging/mellanox
-    version: 24.01-0.3.3.1-9
+    repository: nvcr.io/nvidia/mellanox
+    version: 24.01-0.3.3.1-10
     livenessProbe:
       initialDelaySeconds: 30
       periodSeconds: 30

diff --git a/deployment/network-operator/values.yaml b/deployment/network-operator/values.yaml
@@ -143,13 +143,13 @@ sriov-network-operator:
 
   # Image URIs for sriov-network-operator components
   images:
-    operator: nvcr.io/nvidia/cloud-native/sriov-network-operator:network-operator-24.1.1
-    sriovConfigDaemon: nvcr.io/nvidia/cloud-native/sriov-network-operator-config-daemon:network-operator-24.1.1
+    operator: nvcr.io/nvidia/mellanox/sriov-network-operator:network-operator-24.1.1
+    sriovConfigDaemon: nvcr.io/nvidia/mellanox/sriov-network-operator-config-daemon:network-operator-24.1.1
     sriovCni: ghcr.io/k8snetworkplumbingwg/sriov-cni:3e6368077716f6b8368b0e036a1290d1c64cf1fb
     ibSriovCni: ghcr.io/k8snetworkplumbingwg/ib-sriov-cni:fc002af57a81855542759d0f77d16dacd7e1aa38
     sriovDevicePlugin: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:2cc723dcbc712290055b763dc9d3c090ba41e929
     resourcesInjector: ghcr.io/k8snetworkplumbingwg/network-resources-injector:v1.4
-    webhook: nvcr.io/nvidia/cloud-native/sriov-network-operator-webhook:network-operator-24.1.1
+    webhook: nvcr.io/nvidia/mellanox/sriov-network-operator-webhook:network-operator-24.1.1
   # imagePullSecrest for SR-IOV Network Operator related images
   # imagePullSecrets: []
 
@@ -219,8 +219,8 @@ deployCR: false
 ofedDriver:
   deploy: false
   image: doca-driver
-  repository: nvcr.io/nvstaging/mellanox
-  version: 24.01-0.3.3.1-9
+  repository: nvcr.io/nvidia/mellanox
+  version: 24.01-0.3.3.1-10
   initContainer:
     enable: true
     repository: ghcr.io/mellanox

diff --git a/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ipoib.yaml b/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ipoib.yaml
@@ -18,8 +18,8 @@ metadata:
 spec:
   ofedDriver:
     image: doca-driver
-    repository: nvcr.io/nvstaging/mellanox
-    version: 24.01-0.3.3.1-9
+    repository: nvcr.io/nvidia/mellanox
+    version: 24.01-0.3.3.1-10
     upgradePolicy:
       autoUpgrade: true
       drain:

diff --git a/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-nvidia-ipam.yaml b/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-nvidia-ipam.yaml
@@ -18,8 +18,8 @@ metadata:
 spec:
   ofedDriver:
     image: doca-driver
-    repository: nvcr.io/nvstaging/mellanox
-    version: 24.01-0.3.3.1-9
+    repository: nvcr.io/nvidia/mellanox
+    version: 24.01-0.3.3.1-10
     upgradePolicy:
       autoUpgrade: true
       drain:

diff --git a/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ocp-hostdev.yaml b/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ocp-hostdev.yaml
@@ -18,8 +18,8 @@ metadata:
 spec:
   ofedDriver:
     image: doca-driver
-    repository: nvcr.io/nvstaging/mellanox
-    version: 24.01-0.3.3.1-9
+    repository: nvcr.io/nvidia/mellanox
+    version: 24.01-0.3.3.1-10
     upgradePolicy:
       autoUpgrade: true
       drain:

diff --git a/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ocp.yaml b/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ocp.yaml
@@ -18,8 +18,8 @@ metadata:
 spec:
   ofedDriver:
     image: doca-driver
-    repository: nvcr.io/nvstaging/mellanox
-    version: 24.01-0.3.3.1-9
+    repository: nvcr.io/nvidia/mellanox
+    version: 24.01-0.3.3.1-10
     upgradePolicy:
       autoUpgrade: true
       drain:

diff --git a/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr.yaml b/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr.yaml
@@ -18,8 +18,8 @@ metadata:
 spec:
   ofedDriver:
     image: doca-driver
-    repository: nvcr.io/nvstaging/mellanox
-    version: 24.01-0.3.3.1-9
+    repository: nvcr.io/nvidia/mellanox
+    version: 24.01-0.3.3.1-10
     upgradePolicy:
       autoUpgrade: true
       drain:

diff --git a/hack/release.yaml b/hack/release.yaml
@@ -7,15 +7,15 @@ NetworkOperatorInitContainer:
   version: v0.0.2
 SriovNetworkOperator:
   image: sriov-network-operator
-  repository: nvcr.io/nvidia/cloud-native
+  repository: nvcr.io/nvidia/mellanox
   version: network-operator-24.1.1
 SriovNetworkOperatorWebhook:
   image: sriov-network-operator-webhook
-  repository: nvcr.io/nvidia/cloud-native
+  repository: nvcr.io/nvidia/mellanox
   version: network-operator-24.1.1
 SriovConfigDaemon:
   image: sriov-network-operator-config-daemon
-  repository: nvcr.io/nvidia/cloud-native
+  repository: nvcr.io/nvidia/mellanox
   version: network-operator-24.1.1
 SriovCni:
   image: sriov-cni
@@ -27,8 +27,8 @@ SriovIbCni:
   version: fc002af57a81855542759d0f77d16dacd7e1aa38
 Mofed:
   image: doca-driver
-  repository: nvcr.io/nvstaging/mellanox
-  version: 24.01-0.3.3.1-9
+  repository: nvcr.io/nvidia/mellanox
+  version: 24.01-0.3.3.1-10
 RdmaSharedDevicePlugin:
   image: k8s-rdma-shared-dev-plugin
   repository: ghcr.io/mellanox