Skip to content

Commit 4d021f6

Browse files
Merge branch 'master' into feature/update-Mellanox/sriov-network-device-plugin-tags-to-network-operator-v25.7.0-beta.2
2 parents e0d6bc0 + e6019eb commit 4d021f6

8 files changed

+48
-48
lines changed

deployment/network-operator/values.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@ sriov-network-operator:
161161
images:
162162
operator: nvcr.io/nvidia/mellanox/sriov-network-operator:network-operator-25.4.0
163163
sriovConfigDaemon: nvcr.io/nvidia/mellanox/sriov-network-operator-config-daemon:network-operator-25.4.0
164-
sriovCni: nvcr.io/nvstaging/mellanox/sriov-cni:network-operator-v25.7.0-beta.1
165-
ibSriovCni: nvcr.io/nvstaging/mellanox/ib-sriov-cni:network-operator-v25.7.0-beta.1
166-
ovsCni: nvcr.io/nvstaging/mellanox/ovs-cni-plugin:network-operator-v25.7.0-beta.1
167-
# rdmaCni: nvcr.io/nvstaging/mellanox/rdma-cni:network-operator-v25.7.0-beta.1
164+
sriovCni: nvcr.io/nvstaging/mellanox/sriov-cni:network-operator-v25.7.0-beta.2
165+
ibSriovCni: nvcr.io/nvstaging/mellanox/ib-sriov-cni:network-operator-v25.7.0-beta.2
166+
ovsCni: nvcr.io/nvstaging/mellanox/ovs-cni-plugin:network-operator-v25.7.0-beta.2
167+
# rdmaCni: nvcr.io/nvstaging/mellanox/rdma-cni:network-operator-v25.7.0-beta.2
168168
sriovDevicePlugin: nvcr.io/nvstaging/mellanox/sriov-network-device-plugin:network-operator-v25.7.0-beta.2
169169
resourcesInjector: ghcr.io/k8snetworkplumbingwg/network-resources-injector:v1.7.0
170170
webhook: nvcr.io/nvidia/mellanox/sriov-network-operator-webhook:network-operator-25.4.0
@@ -198,7 +198,7 @@ maintenance-operator-chart:
198198
image:
199199
repository: nvcr.io/nvstaging/mellanox
200200
name: maintenance-operator
201-
tag: network-operator-v25.7.0-beta.1
201+
tag: network-operator-v25.7.0-beta.2
202202
admissionController:
203203
# -- enable admission controller of the operator
204204
enable: false
@@ -312,11 +312,11 @@ operator:
312312
# -- Deploy init container.
313313
enable: true
314314
# -- Init container image repository.
315-
repository: ghcr.io/mellanox
315+
repository: nvcr.io/nvstaging/mellanox
316316
# -- Init container image name.
317317
image: network-operator-init-container
318318
# -- Init container image version.
319-
version: v0.0.3
319+
version: network-operator-v25.7.0-beta.2
320320

321321
# -- An optional list of references to secrets to use for pulling any of the
322322
# Network Operator images.

example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-full-ocp.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
rdmaSharedDevicePlugin:
4646
image: k8s-rdma-shared-dev-plugin
4747
repository: nvcr.io/nvstaging/mellanox
48-
version: network-operator-v25.7.0-beta.1
48+
version: network-operator-v25.7.0-beta.2
4949
# The config below directly propagates to k8s-rdma-shared-device-plugin configuration.
5050
# Replace 'devices' with your (RDMA capable) netdevice name.
5151
config: |
@@ -82,15 +82,15 @@ spec:
8282
ipoib:
8383
image: ipoib-cni
8484
repository: nvcr.io/nvstaging/mellanox
85-
version: network-operator-v25.7.0-beta.1
85+
version: network-operator-v25.7.0-beta.2
8686
ipamPlugin:
8787
image: whereabouts
8888
repository: nvcr.io/nvstaging/mellanox
89-
version: network-operator-v25.7.0-beta.1
89+
version: network-operator-v25.7.0-beta.2
9090
nvIpam:
9191
image: nvidia-k8s-ipam
9292
repository: nvcr.io/nvstaging/mellanox
93-
version: network-operator-v25.7.0-beta.1
93+
version: network-operator-v25.7.0-beta.2
9494
enableWebhook: false
9595
ibKubernetes:
9696
image: ib-kubernetes
@@ -102,7 +102,7 @@ spec:
102102
nicFeatureDiscovery:
103103
image: nic-feature-discovery
104104
repository: nvcr.io/nvstaging/mellanox
105-
version: network-operator-v25.7.0-beta.1
105+
version: network-operator-v25.7.0-beta.2
106106
nicConfigurationOperator:
107107
operator:
108108
image: nic-configuration-operator

example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-full.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
rdmaSharedDevicePlugin:
4646
image: k8s-rdma-shared-dev-plugin
4747
repository: nvcr.io/nvstaging/mellanox
48-
version: network-operator-v25.7.0-beta.1
48+
version: network-operator-v25.7.0-beta.2
4949
# The config below directly propagates to k8s-rdma-shared-device-plugin configuration.
5050
# Replace 'devices' with your (RDMA capable) netdevice name.
5151
config: |
@@ -82,23 +82,23 @@ spec:
8282
cniPlugins:
8383
image: plugins
8484
repository: nvcr.io/nvstaging/mellanox
85-
version: network-operator-v25.7.0-beta.1
85+
version: network-operator-v25.7.0-beta.2
8686
ipoib:
8787
image: ipoib-cni
8888
repository: nvcr.io/nvstaging/mellanox
89-
version: network-operator-v25.7.0-beta.1
89+
version: network-operator-v25.7.0-beta.2
9090
multus:
9191
image: multus-cni
9292
repository: nvcr.io/nvstaging/mellanox
93-
version: network-operator-v25.7.0-beta.1
93+
version: network-operator-v25.7.0-beta.2
9494
ipamPlugin:
9595
image: whereabouts
9696
repository: nvcr.io/nvstaging/mellanox
97-
version: network-operator-v25.7.0-beta.1
97+
version: network-operator-v25.7.0-beta.2
9898
nvIpam:
9999
image: nvidia-k8s-ipam
100100
repository: nvcr.io/nvstaging/mellanox
101-
version: network-operator-v25.7.0-beta.1
101+
version: network-operator-v25.7.0-beta.2
102102
enableWebhook: false
103103
ibKubernetes:
104104
image: ib-kubernetes
@@ -110,7 +110,7 @@ spec:
110110
nicFeatureDiscovery:
111111
image: nic-feature-discovery
112112
repository: nvcr.io/nvstaging/mellanox
113-
version: network-operator-v25.7.0-beta.1
113+
version: network-operator-v25.7.0-beta.2
114114
docaTelemetryService:
115115
image: doca_telemetry
116116
repository: nvcr.io/nvidia/doca

example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ipoib.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
rdmaSharedDevicePlugin:
4141
image: k8s-rdma-shared-dev-plugin
4242
repository: nvcr.io/nvstaging/mellanox
43-
version: network-operator-v25.7.0-beta.1
43+
version: network-operator-v25.7.0-beta.2
4444
# The config below directly propagates to k8s-rdma-shared-device-plugin configuration.
4545
# Replace 'devices' with your (RDMA capable) netdevice name.
4646
config: |
@@ -60,16 +60,16 @@ spec:
6060
cniPlugins:
6161
image: plugins
6262
repository: nvcr.io/nvstaging/mellanox
63-
version: network-operator-v25.7.0-beta.1
63+
version: network-operator-v25.7.0-beta.2
6464
ipoib:
6565
image: ipoib-cni
6666
repository: nvcr.io/nvstaging/mellanox
67-
version: network-operator-v25.7.0-beta.1
67+
version: network-operator-v25.7.0-beta.2
6868
multus:
6969
image: multus-cni
7070
repository: nvcr.io/nvstaging/mellanox
71-
version: network-operator-v25.7.0-beta.1
71+
version: network-operator-v25.7.0-beta.2
7272
ipamPlugin:
7373
image: whereabouts
7474
repository: nvcr.io/nvstaging/mellanox
75-
version: network-operator-v25.7.0-beta.1
75+
version: network-operator-v25.7.0-beta.2

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
rdmaSharedDevicePlugin:
4141
image: k8s-rdma-shared-dev-plugin
4242
repository: nvcr.io/nvstaging/mellanox
43-
version: network-operator-v25.7.0-beta.1
43+
version: network-operator-v25.7.0-beta.2
4444
# The config below directly propagates to k8s-rdma-shared-device-plugin configuration.
4545
# Replace 'devices' with your (RDMA capable) netdevice name.
4646
config: |
@@ -60,13 +60,13 @@ spec:
6060
cniPlugins:
6161
image: plugins
6262
repository: nvcr.io/nvstaging/mellanox
63-
version: network-operator-v25.7.0-beta.1
63+
version: network-operator-v25.7.0-beta.2
6464
multus:
6565
image: multus-cni
6666
repository: nvcr.io/nvstaging/mellanox
67-
version: network-operator-v25.7.0-beta.1
67+
version: network-operator-v25.7.0-beta.2
6868
nvIpam:
6969
image: nvidia-k8s-ipam
7070
repository: nvcr.io/nvstaging/mellanox
71-
version: network-operator-v25.7.0-beta.1
71+
version: network-operator-v25.7.0-beta.2
7272
enableWebhook: false

example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr-ocp.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
rdmaSharedDevicePlugin:
3232
image: k8s-rdma-shared-dev-plugin
3333
repository: nvcr.io/nvstaging/mellanox
34-
version: network-operator-v25.7.0-beta.1
34+
version: network-operator-v25.7.0-beta.2
3535
# The config below directly propagates to k8s-rdma-shared-device-plugin configuration.
3636
# Replace 'devices' with your (RDMA capable) netdevice name.
3737
config: |

example/crs/mellanox.com_v1alpha1_nicclusterpolicy_cr.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
rdmaSharedDevicePlugin:
4141
image: k8s-rdma-shared-dev-plugin
4242
repository: nvcr.io/nvstaging/mellanox
43-
version: network-operator-v25.7.0-beta.1
43+
version: network-operator-v25.7.0-beta.2
4444
# The config below directly propagates to k8s-rdma-shared-device-plugin configuration.
4545
# Replace 'devices' with your (RDMA capable) netdevice name.
4646
config: |
@@ -60,12 +60,12 @@ spec:
6060
cniPlugins:
6161
image: plugins
6262
repository: nvcr.io/nvstaging/mellanox
63-
version: network-operator-v25.7.0-beta.1
63+
version: network-operator-v25.7.0-beta.2
6464
multus:
6565
image: multus-cni
6666
repository: nvcr.io/nvstaging/mellanox
67-
version: network-operator-v25.7.0-beta.1
67+
version: network-operator-v25.7.0-beta.2
6868
ipamPlugin:
6969
image: whereabouts
7070
repository: nvcr.io/nvstaging/mellanox
71-
version: network-operator-v25.7.0-beta.1
71+
version: network-operator-v25.7.0-beta.2

hack/release.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ NetworkOperator:
44
version: v25.7.0-beta.1
55
NetworkOperatorInitContainer:
66
image: network-operator-init-container
7-
repository: ghcr.io/mellanox
7+
repository: nvcr.io/nvstaging/mellanox
88
sourceRepository: network-operator-init-container
9-
version: v0.0.3
9+
version: network-operator-v25.7.0-beta.2
1010
SriovNetworkOperator:
1111
image: sriov-network-operator
1212
repository: nvcr.io/nvidia/mellanox
@@ -24,12 +24,12 @@ SriovCni:
2424
image: sriov-cni
2525
repository: nvcr.io/nvstaging/mellanox
2626
sourceRepository: sriov-cni
27-
version: network-operator-v25.7.0-beta.1
27+
version: network-operator-v25.7.0-beta.2
2828
SriovIbCni:
2929
image: ib-sriov-cni
3030
repository: nvcr.io/nvstaging/mellanox
3131
sourceRepository: ib-sriov-cni
32-
version: network-operator-v25.7.0-beta.1
32+
version: network-operator-v25.7.0-beta.2
3333
Mofed:
3434
image: doca-driver
3535
repository: nvcr.io/nvstaging/mellanox
@@ -38,7 +38,7 @@ RdmaSharedDevicePlugin:
3838
image: k8s-rdma-shared-dev-plugin
3939
repository: nvcr.io/nvstaging/mellanox
4040
sourceRepository: k8s-rdma-shared-dev-plugin
41-
version: network-operator-v25.7.0-beta.1
41+
version: network-operator-v25.7.0-beta.2
4242
SriovDevicePlugin:
4343
image: sriov-network-device-plugin
4444
repository: nvcr.io/nvstaging/mellanox
@@ -53,32 +53,32 @@ CniPlugins:
5353
image: plugins
5454
repository: nvcr.io/nvstaging/mellanox
5555
sourceRepository: k8snetworkplumbingwg-plugins
56-
version: network-operator-v25.7.0-beta.1
56+
version: network-operator-v25.7.0-beta.2
5757
Multus:
5858
image: multus-cni
5959
repository: nvcr.io/nvstaging/mellanox
6060
sourceRepository: multus-cni
61-
version: network-operator-v25.7.0-beta.1
61+
version: network-operator-v25.7.0-beta.2
6262
Ipoib:
6363
image: ipoib-cni
6464
repository: nvcr.io/nvstaging/mellanox
6565
sourceRepository: ipoib-cni
66-
version: network-operator-v25.7.0-beta.1
66+
version: network-operator-v25.7.0-beta.2
6767
IpamPlugin:
6868
image: whereabouts
6969
repository: nvcr.io/nvstaging/mellanox
7070
sourceRepository: whereabouts
71-
version: network-operator-v25.7.0-beta.1
71+
version: network-operator-v25.7.0-beta.2
7272
nvIpam:
7373
image: nvidia-k8s-ipam
7474
repository: nvcr.io/nvstaging/mellanox
7575
sourceRepository: nvidia-k8s-ipam
76-
version: network-operator-v25.7.0-beta.1
76+
version: network-operator-v25.7.0-beta.2
7777
nicFeatureDiscovery:
7878
image: nic-feature-discovery
7979
repository: nvcr.io/nvstaging/mellanox
8080
sourceRepository: nic-feature-discovery
81-
version: network-operator-v25.7.0-beta.1
81+
version: network-operator-v25.7.0-beta.2
8282
docaTelemetryService:
8383
image: doca_telemetry
8484
repository: nvcr.io/nvidia/doca
@@ -87,12 +87,12 @@ ovsCni:
8787
image: ovs-cni-plugin
8888
repository: nvcr.io/nvstaging/mellanox
8989
sourceRepository: ovs-cni
90-
version: network-operator-v25.7.0-beta.1
90+
version: network-operator-v25.7.0-beta.2
9191
rdmaCni:
9292
image: rdma-cni
9393
repository: nvcr.io/nvstaging/mellanox
9494
sourceRepository: rdma-cni
95-
version: network-operator-v25.7.0-beta.1
95+
version: network-operator-v25.7.0-beta.2
9696
nicConfigurationOperator:
9797
image: nic-configuration-operator
9898
repository: ghcr.io/mellanox
@@ -106,12 +106,12 @@ maintenanceOperator:
106106
image: maintenance-operator
107107
repository: nvcr.io/nvstaging/mellanox
108108
sourceRepository: maintenance-operator
109-
version: network-operator-v25.7.0-beta.1
109+
version: network-operator-v25.7.0-beta.2
110110
spectrumXOperator:
111111
image: spectrum-x-operator
112112
repository: nvcr.io/nvstaging/mellanox
113113
sourceRepository: spectrum-x-operator
114-
version: network-operator-v25.7.0-beta.1
114+
version: network-operator-v25.7.0-beta.2
115115
nodeFeatureDiscovery:
116116
image: node-feature-discovery
117117
repository: registry.k8s.io/nfd

0 commit comments

Comments
 (0)