Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/networkoperatorplugin/maintenance_render_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ func TestMaxParallelUpgradesRendersInNCPAndNNP(t *testing.T) {
t.Run(profile.dir+"/"+releaseName, func(t *testing.T) {
rendered := renderFullProfileForMaintenance(t, profile, release, maintenanceYAML)
manifestFragment := "11-nicnodepolicy"
if release == "25.10" || release == "26.1" {
if profile.dir == "host-device-rdma" || release == "25.10" || release == "26.1" {
manifestFragment = "10-nicclusterpolicy"
}
names := fileNamesMatching(rendered, manifestFragment)
Expand Down
9 changes: 3 additions & 6 deletions profiles/host-device-rdma/10-nicclusterpolicy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,9 @@ spec:
image: multus-cni
repository: "{{.NetworkOperator.Repository}}"
version: "{{.NetworkOperator.ComponentVersion}}"
{{- if versionLT .NetworkOperator.SelectedRelease "26.4" }}
{{- /* 26.1 model: NicNodePolicy does not exist; OFED driver and the
SR-IOV device plugin are configured here in NicClusterPolicy and
apply cluster-wide. legacySriovDevicePluginConfigList aggregates
east-west PFs across all groups since NCP is a singleton. */}}
{{- /* Keep the host-device OFED driver and SR-IOV device plugin in the
cluster-wide NicClusterPolicy. legacySriovDevicePluginConfigList
aggregates east-west PFs across all groups since NCP is a singleton. */}}
{{- if .DOCADriver.Enable }}
ofedDriver:
image: doca-driver
Expand Down Expand Up @@ -101,4 +99,3 @@ spec:
{
"resourceList": [{{ legacySriovDevicePluginConfigList .ClusterConfig .Hostdev .Profile.Multirail (and .NicConfigurationOperator .NicConfigurationOperator.DeployNicInterfaceNameTemplate) }}]
}
{{- end }}
99 changes: 0 additions & 99 deletions profiles/host-device-rdma/11-nicnodepolicy.yaml

This file was deleted.

3 changes: 1 addition & 2 deletions profiles/host-device-rdma/profile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ deploymentGuide: host-device-rdma.md
templates:
- 00-values.yaml
- 10-nicclusterpolicy.yaml
- 11-nicnodepolicy.yaml
- 20-ippool.yaml
- 35-nicinterfacenametemplate.yaml
- 30-hostdevicenetwork.yaml
- 40-example-daemonset.yaml
- 40-example-daemonset.yaml