Merge pull request #610 from zeeke/openstack-panic-fix

openstack: Fix `nil` HostManager in `openstackContext`
k8snetworkplumbingwg · Feb 8, 2024 · f8405cf · f8405cf
2 parents a7d40a7 + 1c76c13
commit f8405cf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/pkg/platforms/openstack/openstack.go b/pkg/platforms/openstack/openstack.go
@@ -102,8 +102,10 @@ type OSPDeviceInfo struct {
 	NetworkID  string
 }
 
-func New() OpenstackInterface {
-	return &openstackContext{}
+func New(hostManager host.HostManagerInterface) OpenstackInterface {
+	return &openstackContext{
+		hostManager: hostManager,
+	}
 }
 
 // GetOpenstackData gets the metadata and network_data

diff --git a/pkg/platforms/platforms.go b/pkg/platforms/platforms.go
@@ -1,8 +1,10 @@
 package platforms
 
 import (
+	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/host"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/platforms/openshift"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/platforms/openstack"
+	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/utils"
 )
 
 //go:generate ../../bin/mockgen -destination mock/mock_platforms.go -source platforms.go
@@ -21,8 +23,9 @@ func NewDefaultPlatformHelper() (Interface, error) {
 	if err != nil {
 		return nil, err
 	}
-
-	openstackContext := openstack.New()
+	utilsHelper := utils.New()
+	hostManager := host.NewHostManager(utilsHelper)
+	openstackContext := openstack.New(hostManager)
 
 	return &platformHelper{
 		openshiftContext,