Skip to content

Subscribe to container engine API for published ports #4021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Subscribe to container engine API for published ports #4021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 28 additions & 5 deletions cmd/lima-guestagent/daemon_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,25 @@ func newDaemonCommand() *cobra.Command {
daemonCommand.Flags().Duration("tick", 3*time.Second, "Tick for polling events")
daemonCommand.Flags().Int("vsock-port", 0, "Use vsock server instead a UNIX socket")
daemonCommand.Flags().String("virtio-port", "", "Use virtio server instead a UNIX socket")
daemonCommand.Flags().StringSlice("docker-sockets", []string{}, "Paths to Docker socket files to monitor for exposed ports")
daemonCommand.Flags().StringSlice("containerd-sockets", []string{}, "Paths to Containerd socket files to monitor for exposed ports")
daemonCommand.Flags().StringSlice("kubernetes-configs", []string{}, "Path to Kubernetes config file to monitor for ports")
return daemonCommand
}

func daemonAction(cmd *cobra.Command, _ []string) error {
ctx := cmd.Context()
if os.Geteuid() != 0 {
return errors.New("must run as the root user")
}
socket := "/run/lima-guestagent.sock"
tick, err := cmd.Flags().GetDuration("tick")
if err != nil {
return err
}
if tick == 0 {
return errors.New("tick must be specified")
}
vSockPort, err := cmd.Flags().GetInt("vsock-port")
if err != nil {
return err
Expand All @@ -46,12 +55,19 @@ func daemonAction(cmd *cobra.Command, _ []string) error {
if err != nil {
return err
}
if tick == 0 {
return errors.New("tick must be specified")
dockerSockets, err := cmd.Flags().GetStringSlice("docker-sockets")
if err != nil {
return err
}
if os.Geteuid() != 0 {
return errors.New("must run as the root user")
containerdSockets, err := cmd.Flags().GetStringSlice("containerd-sockets")
if err != nil {
return err
}
kubernetesConfig, err := cmd.Flags().GetStringSlice("kubernetes-configs")
if err != nil {
return err
}

logrus.Infof("event tick: %v", tick)

newTicker := func() (<-chan time.Time, func()) {
Expand All @@ -62,7 +78,14 @@ func daemonAction(cmd *cobra.Command, _ []string) error {
return ticker.C, ticker.Stop
}

agent, err := guestagent.New(ctx, newTicker, tick*20)
agent, err := guestagent.New(
&guestagent.Config{
Ticker: newTicker,
IptablesIdle: tick * 20,
DockerSockets: dockerSockets,
ContainerdSockets: containerdSockets,
KubernetesConfigs: kubernetesConfig,
})
if err != nil {
return err
}
Expand Down
34 changes: 32 additions & 2 deletions cmd/lima-guestagent/install_systemd_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ func newInstallSystemdCommand() *cobra.Command {
}
installSystemdCommand.Flags().Int("vsock-port", 0, "Use vsock server on specified port")
installSystemdCommand.Flags().String("virtio-port", "", "Use virtio server instead a UNIX socket")
installSystemdCommand.Flags().StringSlice("docker-sockets", []string{}, "Paths to Docker socket files to monitor for exposed ports")
installSystemdCommand.Flags().StringSlice("containerd-sockets", []string{}, "Paths to Containerd socket files to monitor for exposed ports")
installSystemdCommand.Flags().StringSlice("kubernetes-configs", []string{}, "Path to Kubernetes config files to monitor for ports")
return installSystemdCommand
}

Expand All @@ -43,7 +46,25 @@ func installSystemdAction(cmd *cobra.Command, _ []string) error {
if err != nil {
return err
}
unit, err := generateSystemdUnit(vsockPort, virtioPort, debug)
dockerSockets, err := cmd.Flags().GetStringSlice("docker-sockets")
if err != nil {
return err
}
containerdSockets, err := cmd.Flags().GetStringSlice("containerd-sockets")
if err != nil {
return err
}
kubernetesConfigs, err := cmd.Flags().GetStringSlice("kubernetes-configs")
if err != nil {
return err
}
unit, err := generateSystemdUnit(
vsockPort,
virtioPort,
dockerSockets,
containerdSockets,
kubernetesConfigs,
debug)
if err != nil {
return err
}
Expand Down Expand Up @@ -82,7 +103,7 @@ func installSystemdAction(cmd *cobra.Command, _ []string) error {
//go:embed lima-guestagent.TEMPLATE.service
var systemdUnitTemplate string

func generateSystemdUnit(vsockPort int, virtioPort string, debug bool) ([]byte, error) {
func generateSystemdUnit(vsockPort int, virtioPort string, dockerSockets, containerdSockets, kubeConfigs []string, debug bool) ([]byte, error) {
selfExeAbs, err := os.Executable()
if err != nil {
return nil, err
Expand All @@ -98,6 +119,15 @@ func generateSystemdUnit(vsockPort int, virtioPort string, debug bool) ([]byte,
if debug {
args = append(args, "--debug")
}
if len(dockerSockets) > 0 {
args = append(args, "--docker-sockets", strings.Join(dockerSockets, ","))
}
if len(containerdSockets) > 0 {
args = append(args, "--containerd-sockets", strings.Join(containerdSockets, ","))
}
if len(kubeConfigs) > 0 {
args = append(args, "--kubernetes-configs", strings.Join(kubeConfigs, ","))
}

m := map[string]string{
"Binary": selfExeAbs,
Expand Down
54 changes: 51 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@ require (
github.com/cpuguy83/go-md2man/v2 v2.0.7
github.com/digitalocean/go-qemu v0.0.0-20221209210016-f035778c97f7
github.com/diskfs/go-diskfs v1.7.0 // gomodjail:unconfined
github.com/docker/docker v28.3.3+incompatible
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will it help with respect to code maintenance if we can create a go mod to handle all these.

I did create trackport to handle multiple various implementation of port identification

https://github.com/balajiv113/trackport/blob/main/pkg/trackapi/api.go

https://github.com/balajiv113/trackport/tree/main/pkg/internal

github.com/docker/go-connections v0.5.0
github.com/docker/go-units v0.5.0
github.com/elastic/go-libaudit/v2 v2.6.2
github.com/foxcpp/go-mockdns v1.1.0
github.com/goccy/go-yaml v1.18.0
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.7.0
github.com/google/yamlfmt v0.17.2
github.com/invopop/jsonschema v0.13.0
Expand Down Expand Up @@ -63,22 +66,22 @@ require (
github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/creack/pty v1.1.18 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/digitalocean/go-libvirt v0.0.0-20220804181439-8648fbde413e // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/djherbis/times v1.6.0 // indirect
github.com/elliotchance/orderedmap v1.8.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
github.com/fatih/color v1.18.0 // indirect
// gomodjail:unconfined
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/goccy/go-json v0.10.5 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/gnostic-models v0.7.0 // indirect
github.com/google/gopacket v1.1.19 // indirect
Expand All @@ -101,7 +104,11 @@ require (
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
github.com/opencontainers/runtime-spec v1.1.0 // indirect
github.com/opencontainers/selinux v1.11.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
github.com/pierrec/lz4/v4 v4.1.22 // indirect
github.com/pkg/errors v0.9.1 // indirect
Expand All @@ -113,11 +120,15 @@ require (
github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/yuin/gopher-lua v1.1.1 // indirect
go.opentelemetry.io/otel v1.37.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 // indirect
go.opentelemetry.io/otel/metric v1.37.0 // indirect
go.opentelemetry.io/otel/trace v1.37.0 // indirect
golang.org/x/crypto v0.42.0 // indirect
golang.org/x/mod v0.27.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/term v0.35.0 // indirect
golang.org/x/time v0.9.0 // indirect
golang.org/x/time v0.12.0 // indirect
golang.org/x/tools v0.36.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
Expand All @@ -141,3 +152,40 @@ require (
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
)

require github.com/containerd/containerd v1.7.28

require (
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect
github.com/Microsoft/hcsshim v0.11.7 // indirect
github.com/containerd/cgroups v1.1.0 // indirect
github.com/containerd/containerd/api v1.9.0
github.com/containerd/errdefs v0.3.0 // indirect
github.com/containerd/fifo v1.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/containerd/ttrpc v1.2.7 // indirect
github.com/containerd/typeurl/v2 v2.2.0 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/klauspost/compress v1.17.4 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/moby/sys/sequential v0.6.0 // indirect
github.com/moby/sys/signal v0.7.0 // indirect
github.com/moby/sys/user v0.3.0 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect
)

require (
github.com/containerd/errdefs/pkg v0.3.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/sys/atomicwriter v0.1.0 // indirect
github.com/moby/term v0.5.2 // indirect
)
Loading
Loading