Skip to content

Commit 0ec1c30

Browse files
committed
feat(agent): wire LinuxNetManager into production driver
1 parent 76adce9 commit 0ec1c30

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

cmd/agent/driver_linux.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@ import (
66
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
77

88
"github.com/syscode-labs/imp/internal/agent"
9+
"github.com/syscode-labs/imp/internal/agent/network"
910
)
1011

11-
// newProductionDriver creates a FirecrackerDriver from environment variables.
12+
// newProductionDriver creates a FirecrackerDriver wired with a LinuxNetManager.
1213
// Reads FC_BIN, FC_SOCK_DIR, FC_KERNEL, FC_KERNEL_ARGS, and IMP_IMAGE_CACHE.
1314
func newProductionDriver(client ctrlclient.Client) (agent.VMDriver, error) {
14-
return agent.NewFirecrackerDriver(client)
15+
d, err := agent.NewFirecrackerDriver(client)
16+
if err != nil {
17+
return nil, err
18+
}
19+
d.Net = network.NewLinuxNetManager()
20+
return d, nil
1521
}

cmd/operator/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func main() {
117117
if err = (&controller.ImpNetworkReconciler{
118118
Client: mgr.GetClient(),
119119
Scheme: mgr.GetScheme(),
120-
Recorder: mgr.GetEventRecorderFor("impnetwork-controller"),
120+
Recorder: mgr.GetEventRecorderFor("impnetwork-controller"), //nolint:staticcheck
121121
CNIStore: cniStore,
122122
}).SetupWithManager(mgr); err != nil {
123123
setupLog.Error(err, "unable to create controller", "controller", "ImpNetwork")
@@ -157,7 +157,7 @@ func main() {
157157

158158
if err := mgr.Add(&cniDetectRunnable{
159159
client: mgr.GetClient(),
160-
recorder: mgr.GetEventRecorderFor("cni-detector"),
160+
recorder: mgr.GetEventRecorderFor("cni-detector"), //nolint:staticcheck
161161
store: cniStore,
162162
}); err != nil {
163163
setupLog.Error(err, "unable to register cni-detect runnable")

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ require (
77
github.com/google/go-containerregistry v0.21.1
88
github.com/onsi/ginkgo/v2 v2.27.2
99
github.com/onsi/gomega v1.38.2
10+
github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
1011
k8s.io/api v0.35.0
1112
k8s.io/apimachinery v0.35.0
1213
k8s.io/client-go v0.35.0
@@ -73,7 +74,6 @@ require (
7374
github.com/sirupsen/logrus v1.9.3 // indirect
7475
github.com/spf13/pflag v1.0.9 // indirect
7576
github.com/vbatts/tar-split v0.12.2 // indirect
76-
github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5 // indirect
7777
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
7878
github.com/x448/float16 v0.8.4 // indirect
7979
go.mongodb.org/mongo-driver v1.8.3 // indirect

0 commit comments

Comments
 (0)