From 9a20283ae443474eb34631797e83660b1c646187 Mon Sep 17 00:00:00 2001
From: Ido Heyvi <iheyvi@nvidia.com>
Date: Wed, 4 Dec 2024 16:44:08 +0200
Subject: [PATCH] chore: update master branch values/release.yaml according to
 latest 24.10 GA

Signed-off-by: Ido Heyvi <iheyvi@nvidia.com>
---
 bundle.Dockerfile                             |  4 +--
 ...etwork-operator.clusterserviceversion.yaml | 30 ++++++++-----------
 ...ellanox.com_v1alpha1_nicclusterpolicy.yaml |  4 +--
 deployment/network-operator/Chart.yaml        |  4 +--
 deployment/network-operator/values.yaml       |  8 ++---
 ...com_v1alpha1_nicclusterpolicy_cr-full.yaml |  4 +--
 ...om_v1alpha1_nicclusterpolicy_cr-ipoib.yaml |  4 +--
 ...lpha1_nicclusterpolicy_cr-nvidia-ipam.yaml |  4 +--
 ...lpha1_nicclusterpolicy_cr-ocp-hostdev.yaml |  2 +-
 ....com_v1alpha1_nicclusterpolicy_cr-ocp.yaml |  4 +--
 ...anox.com_v1alpha1_nicclusterpolicy_cr.yaml |  4 +--
 hack/release.yaml                             | 20 ++++++-------
 12 files changed, 44 insertions(+), 48 deletions(-)

diff --git a/bundle.Dockerfile b/bundle.Dockerfile
index 2eebecea..57feb241 100644
--- a/bundle.Dockerfile
+++ b/bundle.Dockerfile
@@ -5,8 +5,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=nvidia-network-operator
-LABEL operators.operatorframework.io.bundle.channels.v1=v24.7.0-rc.1,stable
-LABEL operators.operatorframework.io.bundle.channel.default.v1=v24.7.0-rc.1
+LABEL operators.operatorframework.io.bundle.channels.v1=stable,v24.10
+LABEL operators.operatorframework.io.bundle.channel.default.v1=v24.10
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.33.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
diff --git a/bundle/manifests/nvidia-network-operator.clusterserviceversion.yaml b/bundle/manifests/nvidia-network-operator.clusterserviceversion.yaml
index 5f05c7c3..18db0e2d 100644
--- a/bundle/manifests/nvidia-network-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/nvidia-network-operator.clusterserviceversion.yaml
@@ -2,7 +2,7 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: ClusterServiceVersion
 metadata:
   annotations:
-    containerImage: nvcr.io/nvstaging/mellanox/network-operator@sha256:d8f8d33a042ce75061cf1e1178e2ccc08bf7091d4cc623c6d11ad6155cf99d4a
+    containerImage: nvcr.io/nvidia/cloud-native/network-operator@sha256:f258e8665d094c09159654759bc9ae41fbe0f7fffe95139ec02964759c3d8a87
     alm-examples: |-
       [
         {
@@ -60,7 +60,7 @@ metadata:
                 "initialDelaySeconds": 10,
                 "periodSeconds": 30
               },
-              "repository": "nvcr.io/nvstaging/mellanox",
+              "repository": "nvcr.io/nvidia/mellanox",
               "startupProbe": {
                 "initialDelaySeconds": 10,
                 "periodSeconds": 20
@@ -83,13 +83,13 @@ metadata:
               "config": "{\n  \"configList\": [\n    {\n      \"resourceName\": \"rdma_shared_device_a\",\n      \"rdmaHcaMax\": 63,\n      \"selectors\": {\n        \"vendors\": [\"15b3\"]\n      }\n    }\n  ]\n}\n",
               "image": "k8s-rdma-shared-dev-plugin",
               "repository": "ghcr.io/mellanox",
-              "version": "sha-4f3eb2224b8b5f97be3f17441ddee8d41753b7d5"
+              "version": "v1.5.2"
             }
           }
         }
       ]
     capabilities: Basic Install
-    createdAt: "2024-11-12T00:27:59Z"
+    createdAt: "2024-12-08T12:15:11Z"
     description: Deploy and manage NVIDIA networking resources in Kubernetes
     features.operators.openshift.io/cnf: "false"
     features.operators.openshift.io/cni: "true"
@@ -110,7 +110,7 @@ metadata:
   labels:
     operatorframework.io/arch.amd64: supported
     operatorframework.io/arch.arm64: supported
-  name: nvidia-network-operator.v24.10.0-rc.1
+  name: nvidia-network-operator.v24.10.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -456,7 +456,7 @@ spec:
                   value: "true"
                 - name: OFED_INIT_CONTAINER_IMAGE
                   value: ghcr.io/mellanox/network-operator-init-container:v0.0.2
-                image: nvcr.io/nvstaging/mellanox/network-operator@sha256:d8f8d33a042ce75061cf1e1178e2ccc08bf7091d4cc623c6d11ad6155cf99d4a
+                image: nvcr.io/nvidia/cloud-native/network-operator@sha256:f258e8665d094c09159654759bc9ae41fbe0f7fffe95139ec02964759c3d8a87
                 imagePullPolicy: IfNotPresent
                 livenessProbe:
                   httpGet:
@@ -563,7 +563,7 @@ spec:
   provider:
     name: NVIDIA
     url: https://github.com/Mellanox/network-operator/
-  version: 24.10.0-rc.1
+  version: 24.10.0
   webhookdefinitions:
   - admissionReviewVersions:
     - v1
@@ -607,11 +607,11 @@ spec:
     webhookPath: /validate-mellanox-com-v1alpha1-nicclusterpolicy
   relatedImages:
     - name: nvidia-network-operator
-      image: nvcr.io/nvstaging/mellanox/network-operator@sha256:d8f8d33a042ce75061cf1e1178e2ccc08bf7091d4cc623c6d11ad6155cf99d4a
+      image: nvcr.io/nvidia/cloud-native/network-operator@sha256:f258e8665d094c09159654759bc9ae41fbe0f7fffe95139ec02964759c3d8a87
     - name: nvidia-network-operator-init-container
       image: ghcr.io/mellanox/network-operator-init-container@sha256:1699d23027ea30c9fa59575a914114bdfd5a87a359caf8c0a9b16d409ec0d068
     - name: rdma-shared-device-plugin
-      image: ghcr.io/mellanox/k8s-rdma-shared-dev-plugin@sha256:3e6f3c753a26bf57ea4bfad439eba45be42b85fec656835bd8b5a44258973546
+      image: ghcr.io/mellanox/k8s-rdma-shared-dev-plugin@sha256:9f468fdc4449e65e4772575f83aa85840a00f97165f9a00ba34695c91d610fbd
     - name: sriov-network-device-plugin
       image: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin@sha256:77e3b946c20f45728dfa6dd1d115356de5ea317f91cddfd1540b7121550f66dc
     - name: ib-kubernetes
@@ -625,14 +625,10 @@ spec:
     - name: doca-telemetry-service
       image: nvcr.io/nvidia/doca/doca_telemetry@sha256:866971717cb2683f2742d265c9793f93242f55b6e8bd9a0a88a558869f9b9cd7
     - name: doca-driver-0
-      image: nvcr.io/nvstaging/mellanox/doca-driver@sha256:d808786fdf2d2037e0105bc576a075b763217582ed1f9dd3d5d02bfc14ede491
+      image: nvcr.io/nvidia/mellanox/doca-driver@sha256:e36c46cf2c813c081bf7cc22b47fb4cf391a3d91804e47a6ce87f31d62f42535
     - name: doca-driver-1
-      image: nvcr.io/nvstaging/mellanox/doca-driver@sha256:e36c46cf2c813c081bf7cc22b47fb4cf391a3d91804e47a6ce87f31d62f42535
+      image: nvcr.io/nvidia/mellanox/doca-driver@sha256:5a87d04872d5d4530cab3cbb3db528722fa24435f3375debd8ed102b04e631c2
     - name: doca-driver-2
-      image: nvcr.io/nvstaging/mellanox/doca-driver@sha256:5a87d04872d5d4530cab3cbb3db528722fa24435f3375debd8ed102b04e631c2
+      image: nvcr.io/nvidia/mellanox/doca-driver@sha256:ecb2cfdc510b7ed09a59daed4817ee353e83a94d2d8581c3c052f4fa4b990574
     - name: doca-driver-3
-      image: nvcr.io/nvstaging/mellanox/doca-driver@sha256:ecb2cfdc510b7ed09a59daed4817ee353e83a94d2d8581c3c052f4fa4b990574
-    - name: doca-driver-4
-      image: nvcr.io/nvstaging/mellanox/doca-driver@sha256:4bb13a8b850c91011013509334d5ae4f4b7aa1d1b0c12958625e161cd50309d6
-    - name: doca-driver-5
-      image: nvcr.io/nvstaging/mellanox/doca-driver@sha256:db5797121735eeb935d8f11e305b50c80ba07aa83c291d76d05dea7e303bc740
+      image: nvcr.io/nvidia/mellanox/doca-driver@sha256:db5797121735eeb935d8f11e305b50c80ba07aa83c291d76d05dea7e303bc740
diff --git a/config/samples/mellanox.com_v1alpha1_nicclusterpolicy.yaml b/config/samples/mellanox.com_v1alpha1_nicclusterpolicy.yaml
index cf4f06c5..c0b5baed 100644
--- a/config/samples/mellanox.com_v1alpha1_nicclusterpolicy.yaml
+++ b/config/samples/mellanox.com_v1alpha1_nicclusterpolicy.yaml
@@ -18,7 +18,7 @@ metadata:
 spec:
   ofedDriver:
     image: doca-driver
-    repository: nvcr.io/nvstaging/mellanox
+    repository: nvcr.io/nvidia/mellanox
     version: 24.10-0.7.0.0-0
     livenessProbe:
       initialDelaySeconds: 30
@@ -42,7 +42,7 @@ spec:
   rdmaSharedDevicePlugin:
     image: k8s-rdma-shared-dev-plugin
     repository: ghcr.io/mellanox
-    version: sha-4f3eb2224b8b5f97be3f17441ddee8d41753b7d5
+    version: v1.5.2
     # The config below directly propagates to k8s-rdma-shared-device-plugin configuration.
     # Replace 'devices' with your (RDMA capable) netdevice name.
     config: |
diff --git a/deployment/network-operator/Chart.yaml b/deployment/network-operator/Chart.yaml
index a45edf7c..4efc6fad 100644
--- a/deployment/network-operator/Chart.yaml
+++ b/deployment/network-operator/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: network-operator
-version: 24.10.0-rc.1
+version: 24.10.0
 kubeVersion: '>= 1.21.0'
-appVersion: v24.10.0-rc.1
+appVersion: v24.10.0
 description: Nvidia network operator
 type: application
 keywords:
diff --git a/deployment/network-operator/values.yaml b/deployment/network-operator/values.yaml
index 8924066a..a7f2b52f 100644
--- a/deployment/network-operator/values.yaml
+++ b/deployment/network-operator/values.yaml
@@ -152,15 +152,15 @@ sriov-network-operator:
 
   # Image URIs for sriov-network-operator components.
   images:
-    operator: nvcr.io/nvstaging/mellanox/sriov-network-operator:network-operator-24.10.0-rc.1
-    sriovConfigDaemon: nvcr.io/nvstaging/mellanox/sriov-network-operator-config-daemon:network-operator-24.10.0-rc.1
+    operator: nvcr.io/nvidia/mellanox/sriov-network-operator:network-operator-24.10.0
+    sriovConfigDaemon: nvcr.io/nvidia/mellanox/sriov-network-operator-config-daemon:network-operator-24.10.0
     sriovCni: ghcr.io/k8snetworkplumbingwg/sriov-cni:v2.8.1
     ibSriovCni: ghcr.io/k8snetworkplumbingwg/ib-sriov-cni:v1.1.1
     ovsCni: ghcr.io/k8snetworkplumbingwg/ovs-cni-plugin:v0.34.0
     # rdmaCni: ghcr.io/k8snetworkplumbingwg/rdma-cni:v1.2.0
     sriovDevicePlugin: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:v3.8.0
     resourcesInjector: ghcr.io/k8snetworkplumbingwg/network-resources-injector:8810e6a127366cc1eb829d3f7cb3f866d096946e
-    webhook: nvcr.io/nvstaging/mellanox/sriov-network-operator-webhook:network-operator-24.10.0-rc.1
+    webhook: nvcr.io/nvidia/mellanox/sriov-network-operator-webhook:network-operator-24.10.0
   # imagePullSecrest for SR-IOV Network Operator related images
   # imagePullSecrets: []
   sriovOperatorConfig:
@@ -252,7 +252,7 @@ operator:
                 operator: In
                 values: [ "" ]
   # -- Network Operator image repository.
-  repository: nvcr.io/nvstaging/mellanox
+  repository: nvcr.io/nvidia/cloud-native
   # -- Network Operator image name
   image: network-operator
   # imagePullSecrets: []
diff --git a/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-full.yaml b/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-full.yaml
index f56a67a3..2a395bf2 100644
--- a/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-full.yaml
+++ b/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-full.yaml
@@ -23,7 +23,7 @@ metadata:
 spec:
   ofedDriver:
     image: doca-driver
-    repository: nvcr.io/nvstaging/mellanox
+    repository: nvcr.io/nvidia/mellanox
     version: 24.10-0.7.0.0-0
     upgradePolicy:
       autoUpgrade: true
@@ -45,7 +45,7 @@ spec:
   rdmaSharedDevicePlugin:
     image: k8s-rdma-shared-dev-plugin
     repository: ghcr.io/mellanox
-    version: sha-4f3eb2224b8b5f97be3f17441ddee8d41753b7d5
+    version: v1.5.2
     # The config below directly propagates to k8s-rdma-shared-device-plugin configuration.
     # Replace 'devices' with your (RDMA capable) netdevice name.
     config: |
diff --git a/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ipoib.yaml b/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ipoib.yaml
index 270524f8..644bb69f 100644
--- a/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ipoib.yaml
+++ b/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ipoib.yaml
@@ -18,7 +18,7 @@ metadata:
 spec:
   ofedDriver:
     image: doca-driver
-    repository: nvcr.io/nvstaging/mellanox
+    repository: nvcr.io/nvidia/mellanox
     version: 24.10-0.7.0.0-0
     upgradePolicy:
       autoUpgrade: true
@@ -40,7 +40,7 @@ spec:
   rdmaSharedDevicePlugin:
     image: k8s-rdma-shared-dev-plugin
     repository: ghcr.io/mellanox
-    version: sha-4f3eb2224b8b5f97be3f17441ddee8d41753b7d5
+    version: v1.5.2
     # The config below directly propagates to k8s-rdma-shared-device-plugin configuration.
     # Replace 'devices' with your (RDMA capable) netdevice name.
     config: |
diff --git a/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-nvidia-ipam.yaml b/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-nvidia-ipam.yaml
index 14656a75..5403f0c8 100644
--- a/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-nvidia-ipam.yaml
+++ b/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-nvidia-ipam.yaml
@@ -18,7 +18,7 @@ metadata:
 spec:
   ofedDriver:
     image: doca-driver
-    repository: nvcr.io/nvstaging/mellanox
+    repository: nvcr.io/nvidia/mellanox
     version: 24.10-0.7.0.0-0
     upgradePolicy:
       autoUpgrade: true
@@ -40,7 +40,7 @@ spec:
   rdmaSharedDevicePlugin:
     image: k8s-rdma-shared-dev-plugin
     repository: ghcr.io/mellanox
-    version: sha-4f3eb2224b8b5f97be3f17441ddee8d41753b7d5
+    version: v1.5.2
     # The config below directly propagates to k8s-rdma-shared-device-plugin configuration.
     # Replace 'devices' with your (RDMA capable) netdevice name.
     config: |
diff --git a/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ocp-hostdev.yaml b/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ocp-hostdev.yaml
index fd5a5488..2bcf3761 100644
--- a/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ocp-hostdev.yaml
+++ b/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ocp-hostdev.yaml
@@ -18,7 +18,7 @@ metadata:
 spec:
   ofedDriver:
     image: doca-driver
-    repository: nvcr.io/nvstaging/mellanox
+    repository: nvcr.io/nvidia/mellanox
     version: 24.10-0.7.0.0-0
     upgradePolicy:
       autoUpgrade: true
diff --git a/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ocp.yaml b/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ocp.yaml
index b639ed29..832599a7 100644
--- a/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ocp.yaml
+++ b/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ocp.yaml
@@ -18,7 +18,7 @@ metadata:
 spec:
   ofedDriver:
     image: doca-driver
-    repository: nvcr.io/nvstaging/mellanox
+    repository: nvcr.io/nvidia/mellanox
     version: 24.10-0.7.0.0-0
     upgradePolicy:
       autoUpgrade: true
@@ -31,7 +31,7 @@ spec:
   rdmaSharedDevicePlugin:
     image: k8s-rdma-shared-dev-plugin
     repository: ghcr.io/mellanox
-    version: sha-4f3eb2224b8b5f97be3f17441ddee8d41753b7d5
+    version: v1.5.2
     # The config below directly propagates to k8s-rdma-shared-device-plugin configuration.
     # Replace 'devices' with your (RDMA capable) netdevice name.
     config: |
diff --git a/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr.yaml b/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr.yaml
index 721123ad..2e337d24 100644
--- a/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr.yaml
+++ b/example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr.yaml
@@ -18,7 +18,7 @@ metadata:
 spec:
   ofedDriver:
     image: doca-driver
-    repository: nvcr.io/nvstaging/mellanox
+    repository: nvcr.io/nvidia/mellanox
     version: 24.10-0.7.0.0-0
     upgradePolicy:
       autoUpgrade: true
@@ -40,7 +40,7 @@ spec:
   rdmaSharedDevicePlugin:
     image: k8s-rdma-shared-dev-plugin
     repository: ghcr.io/mellanox
-    version: sha-4f3eb2224b8b5f97be3f17441ddee8d41753b7d5
+    version: v1.5.2
     # The config below directly propagates to k8s-rdma-shared-device-plugin configuration.
     # Replace 'devices' with your (RDMA capable) netdevice name.
     config: |
diff --git a/hack/release.yaml b/hack/release.yaml
index 039a0fd6..fd9a2c23 100644
--- a/hack/release.yaml
+++ b/hack/release.yaml
@@ -1,23 +1,23 @@
 NetworkOperator:
   image: network-operator
-  repository: nvcr.io/nvstaging/mellanox
-  version: v24.10.0-rc.1
+  repository: nvcr.io/nvidia/cloud-native
+  version: v24.10.0
 NetworkOperatorInitContainer:
   image: network-operator-init-container
   repository: ghcr.io/mellanox
   version: v0.0.2
 SriovNetworkOperator:
   image: sriov-network-operator
-  repository: nvcr.io/nvstaging/mellanox
-  version: network-operator-24.10.0-rc.1
+  repository: nvcr.io/nvidia/mellanox
+  version: network-operator-24.10.0
 SriovNetworkOperatorWebhook:
   image: sriov-network-operator-webhook
-  repository: nvcr.io/nvstaging/mellanox
-  version: network-operator-24.10.0-rc.1
+  repository: nvcr.io/nvidia/mellanox
+  version: network-operator-24.10.0
 SriovConfigDaemon:
   image: sriov-network-operator-config-daemon
-  repository: nvcr.io/nvstaging/mellanox
-  version: network-operator-24.10.0-rc.1
+  repository: nvcr.io/nvidia/mellanox
+  version: network-operator-24.10.0
 SriovCni:
   image: sriov-cni
   repository: ghcr.io/k8snetworkplumbingwg
@@ -28,12 +28,12 @@ SriovIbCni:
   version: v1.1.1
 Mofed:
   image: doca-driver
-  repository: nvcr.io/nvstaging/mellanox
+  repository: nvcr.io/nvidia/mellanox
   version: 24.10-0.7.0.0-0
 RdmaSharedDevicePlugin:
   image: k8s-rdma-shared-dev-plugin
   repository: ghcr.io/mellanox
-  version: sha-4f3eb2224b8b5f97be3f17441ddee8d41753b7d5
+  version: v1.5.2
 SriovDevicePlugin:
   image: sriov-network-device-plugin
   repository: ghcr.io/k8snetworkplumbingwg