Merge pull request #746 from ykulazhenkov/pr-remove-rdma-core-install

Remove logic that installs rdma-core package

cmd/sriov-network-config-daemon/service.go

@@ -146,9 +146,9 @@ func phasePre(setupLog logr.Logger, conf *systemd.SriovConfig, hostHelpers helpe
 		return fmt.Errorf("failed to remove sriov result file: %v", err)
 	}
 
-	_, err := hostHelpers.TryEnableRdma()
+	_, err := hostHelpers.CheckRDMAEnabled()
 	if err != nil {
-		setupLog.Error(err, "warning, failed to enable RDMA")
+		setupLog.Error(err, "warning, failed to check RDMA state")
 	}
 	hostHelpers.TryEnableTun()
 	hostHelpers.TryEnableVhostNet()

cmd/sriov-network-config-daemon/service_test.go

@@ -158,7 +158,7 @@ var _ = Describe("Service", func() {
 				"/etc/sriov-operator/sriov-interface-result.yaml":   []byte("something"),
 			},
 		})
-		hostHelpers.EXPECT().TryEnableRdma().Return(true, nil)
+		hostHelpers.EXPECT().CheckRDMAEnabled().Return(true, nil)
 		hostHelpers.EXPECT().TryEnableTun().Return()
 		hostHelpers.EXPECT().TryEnableVhostNet().Return()
 		hostHelpers.EXPECT().DiscoverSriovDevices(hostHelpers).Return([]sriovnetworkv1.InterfaceExt{{
@@ -183,7 +183,7 @@ var _ = Describe("Service", func() {
 				"/etc/sriov-operator/sriov-interface-result.yaml":   []byte("something"),
 			},
 		})
-		hostHelpers.EXPECT().TryEnableRdma().Return(true, nil)
+		hostHelpers.EXPECT().CheckRDMAEnabled().Return(true, nil)
 		hostHelpers.EXPECT().TryEnableTun().Return()
 		hostHelpers.EXPECT().TryEnableVhostNet().Return()
 
@@ -211,7 +211,7 @@ var _ = Describe("Service", func() {
 				"/etc/sriov-operator/sriov-interface-result.yaml":   []byte("something"),
 			},
 		})
-		hostHelpers.EXPECT().TryEnableRdma().Return(true, nil)
+		hostHelpers.EXPECT().CheckRDMAEnabled().Return(true, nil)
 		hostHelpers.EXPECT().TryEnableTun().Return()
 		hostHelpers.EXPECT().TryEnableVhostNet().Return()
 		hostHelpers.EXPECT().DiscoverSriovDevices(hostHelpers).Return([]sriovnetworkv1.InterfaceExt{{

doc/quickstart.md

@@ -5,6 +5,7 @@
 1. A supported SRIOV hardware on the cluster nodes. Supported models can be found [here](https://github.com/k8snetworkplumbingwg/sriov-network-operator/blob/master/doc/supported-hardware.md).
 2. Kubernetes or Openshift cluster running on bare metal nodes.
 3. Multus-cni is deployed as default CNI plugin, and there is a default CNI plugin (flannel, openshift-sdn etc.) available for Multus-cni.
+4. On RedHat Enterprise Linux and Ubuntu operating systems, the `rdma-core` package must be installed to support RDMA resource provisioning. On RedHat CoreOS the package installation is not required.
 
 ## Installation
 

pkg/daemon/daemon.go

@@ -129,7 +129,7 @@ func (dn *Daemon) Run(stopCh <-chan struct{}, exitCh <-chan error) error {
 
 	if !vars.UsingSystemdMode {
 		log.Log.V(0).Info("Run(): daemon running in daemon mode")
-		dn.HostHelpers.TryEnableRdma()
+		dn.HostHelpers.CheckRDMAEnabled()
 		dn.HostHelpers.TryEnableTun()
 		dn.HostHelpers.TryEnableVhostNet()
 		err := systemd.CleanSriovFilesFromHost(vars.ClusterType == consts.ClusterTypeOpenshift)

pkg/daemon/daemon_test.go

@@ -145,7 +145,7 @@ var _ = Describe("Config Daemon", func() {
 		platformHelper.EXPECT().IsHypershift().Return(false).AnyTimes()
 
 		vendorHelper := mock_helper.NewMockHostHelpersInterface(mockCtrl)
-		vendorHelper.EXPECT().TryEnableRdma().Return(true, nil).AnyTimes()
+		vendorHelper.EXPECT().CheckRDMAEnabled().Return(true, nil).AnyTimes()
 		vendorHelper.EXPECT().TryEnableVhostNet().AnyTimes()
 		vendorHelper.EXPECT().TryEnableTun().AnyTimes()
 		vendorHelper.EXPECT().PrepareNMUdevRule([]string{"0x1014", "0x154c"}).Return(nil).AnyTimes()