bug: fix helm values generation

Signed-off-by: Fred Rolland <[email protected]>
rollandf · Sep 2, 2024 · 91691c2 · 91691c2
1 parent eb9a522
commit 91691c2
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git 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.07-0.6.1.0-0
     livenessProbe:
       initialDelaySeconds: 30

diff --git a/deployment/network-operator/values.yaml b/deployment/network-operator/values.yaml
@@ -141,15 +141,15 @@ sriov-network-operator:
 
   # Image URIs for sriov-network-operator components.
   images:
-    operator: nvcr.io/nvidia/cloud-native/sriov-network-operator:network-operator-24.7.0
-    sriovConfigDaemon: nvcr.io/nvidia/cloud-native/sriov-network-operator-config-daemon:network-operator-24.7.0
+    operator: nvcr.io/nvidia/mellanox/sriov-network-operator:network-operator-24.7.0
+    sriovConfigDaemon: nvcr.io/nvidia/mellanox/sriov-network-operator-config-daemon:network-operator-24.7.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.7.0
     resourcesInjector: ghcr.io/k8snetworkplumbingwg/network-resources-injector:8810e6a127366cc1eb829d3f7cb3f866d096946e
-    webhook: nvcr.io/nvidia/cloud-native/sriov-network-operator-webhook:network-operator-24.7.0
+    webhook: nvcr.io/nvidia/mellanox/sriov-network-operator-webhook:network-operator-24.7.0
   # imagePullSecrest for SR-IOV Network Operator related images
   # imagePullSecrets: []
   sriovOperatorConfig:
@@ -201,7 +201,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: []
@@ -248,7 +248,7 @@ ofedDriver:
   # -- NVIDIA DOCA Driver image name.
   image: doca-driver
   # -- NVIDIA DOCA Driver image repository.
-  repository: nvcr.io/nvstaging/mellanox
+  repository: nvcr.io/nvidia/mellanox
   # -- NVIDIA DOCA Driver version.
   version: 24.07-0.6.1.0-0
   initContainer:

diff --git 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.07-0.6.1.0-0
     upgradePolicy:
       autoUpgrade: true

diff --git 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.07-0.6.1.0-0
     upgradePolicy:
       autoUpgrade: true

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,7 +18,7 @@ metadata:
 spec:
   ofedDriver:
     image: doca-driver
-    repository: nvcr.io/nvstaging/mellanox
+    repository: nvcr.io/nvidia/mellanox
     version: 24.07-0.6.1.0-0
     upgradePolicy:
       autoUpgrade: true

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,7 +18,7 @@ metadata:
 spec:
   ofedDriver:
     image: doca-driver
-    repository: nvcr.io/nvstaging/mellanox
+    repository: nvcr.io/nvidia/mellanox
     version: 24.07-0.6.1.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
@@ -18,7 +18,7 @@ metadata:
 spec:
   ofedDriver:
     image: doca-driver
-    repository: nvcr.io/nvstaging/mellanox
+    repository: nvcr.io/nvidia/mellanox
     version: 24.07-0.6.1.0-0
     upgradePolicy:
       autoUpgrade: true

diff --git 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.07-0.6.1.0-0
     upgradePolicy:
       autoUpgrade: true

diff --git a/hack/release.yaml b/hack/release.yaml
@@ -8,15 +8,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.7.0
 SriovNetworkOperatorWebhook:
   image: sriov-network-operator-webhook
-  repository: nvcr.io/nvidia/cloud-native
+  repository: nvcr.io/nvidia/mellanox
   version: network-operator-24.7.0
 SriovConfigDaemon:
   image: sriov-network-operator-config-daemon
-  repository: nvcr.io/nvidia/cloud-native
+  repository: nvcr.io/nvidia/mellanox
   version: network-operator-24.7.0
 SriovCni:
   image: sriov-cni
@@ -28,7 +28,7 @@ SriovIbCni:
   version: v1.1.1
 Mofed:
   image: doca-driver
-  repository: nvcr.io/nvstaging/mellanox
+  repository: nvcr.io/nvidia/mellanox
   version: 24.07-0.6.1.0-0
 RdmaSharedDevicePlugin:
   image: k8s-rdma-shared-dev-plugin

diff --git a/hack/templates/values/values.template b/hack/templates/values/values.template
@@ -201,7 +201,7 @@ operator:
                 operator: In
                 values: [ "" ]
   # -- Network Operator image repository.
-  repository: nvcr.io/nvstaging/mellanox
+  repository: {{ .NetworkOperator.Repository }}
   # -- Network Operator image name
   image: network-operator
   # imagePullSecrets: []