diff --git a/cmd/server/main.go b/cmd/server/main.go index 97b0449a1bf..da25369a10d 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -6,7 +6,6 @@ import ( "os" "path/filepath" - "github.com/docker/docker/pkg/reexec" "github.com/k3s-io/k3s/pkg/cli/agent" "github.com/k3s-io/k3s/pkg/cli/cert" "github.com/k3s-io/k3s/pkg/cli/cmds" @@ -22,6 +21,7 @@ import ( "github.com/k3s-io/k3s/pkg/containerd" ctr2 "github.com/k3s-io/k3s/pkg/ctr" kubectl2 "github.com/k3s-io/k3s/pkg/kubectl" + "github.com/moby/sys/reexec" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" crictl2 "sigs.k8s.io/cri-tools/cmd/crictl" diff --git a/go.mod b/go.mod index f9e59a64c87..82855b118e2 100644 --- a/go.mod +++ b/go.mod @@ -114,6 +114,7 @@ require ( github.com/klauspost/compress v1.18.2 github.com/libp2p/go-libp2p v0.43.0 github.com/minio/minio-go/v7 v7.0.91 + github.com/moby/sys/reexec v0.1.0 github.com/moby/sys/userns v0.1.0 github.com/mwitkow/go-http-dialer v0.0.0-20161116154839-378f744fb2b8 github.com/natefinch/lumberjack v2.0.0+incompatible diff --git a/go.sum b/go.sum index 6e3efc2bcb0..2e9112de5fe 100644 --- a/go.sum +++ b/go.sum @@ -1015,6 +1015,8 @@ github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg= github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4= +github.com/moby/sys/reexec v0.1.0 h1:RrBi8e0EBTLEgfruBOFcxtElzRGTEUkeIFaVXgU7wok= +github.com/moby/sys/reexec v0.1.0/go.mod h1:EqjBg8F3X7iZe5pU6nRZnYCMUTXoxsjiIfHup5wYIN8= github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU= github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko= github.com/moby/sys/signal v0.7.1 h1:PrQxdvxcGijdo6UXXo/lU/TvHUWyPhj7UOpSo8tuvk0=