Merge pull request #13 from flatcar/go1.21

go.mod: Downgrade to go1.21

go.mod

@@ -1,17 +1,13 @@
 module github.com/flatcar/mayday
 
-go 1.22
+go 1.21
 
 require (
 	github.com/coreos/go-systemd v0.0.0-20160621134601-b32b8467dbea
 	github.com/godbus/dbus v0.0.0-20151211231602-a1b8ba5163b7
-	github.com/golang/protobuf v0.0.0-20160106020635-2402d76f3d41
 	github.com/spf13/pflag v1.0.0
 	github.com/spf13/viper v0.0.0-20170619124313-c1de95864d73
 	github.com/stretchr/testify v1.5.1
-	golang.org/x/net v0.28.0
-	google.golang.org/grpc v0.0.0-20160225213019-0f80f5b995e8
-	gopkg.in/yaml.v2 v2.2.2
 )
 
 require (
@@ -28,4 +24,5 @@ require (
 	github.com/spf13/jwalterweatherman v0.0.0-20170523133247-0efa5202c046 // indirect
 	golang.org/x/sys v0.23.0 // indirect
 	golang.org/x/text v0.17.0 // indirect
+	gopkg.in/yaml.v2 v2.2.2 // indirect
 )

go.sum

@@ -8,8 +8,6 @@ github.com/fsnotify/fsnotify v1.4.3-0.20170329110642-4da3e2cfbabc h1:omfZI1v/Bu4
 github.com/fsnotify/fsnotify v1.4.3-0.20170329110642-4da3e2cfbabc/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/godbus/dbus v0.0.0-20151211231602-a1b8ba5163b7 h1:zpqC5YRUXCiWYU+VUgjD7zeHCReKKX1+cXGka6WSFSc=
 github.com/godbus/dbus v0.0.0-20151211231602-a1b8ba5163b7/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
-github.com/golang/protobuf v0.0.0-20160106020635-2402d76f3d41 h1:BIDtr9YECqqvixqxNnfN1Dp4dlRZB2nS68tywI+YZj4=
-github.com/golang/protobuf v0.0.0-20160106020635-2402d76f3d41/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/hashicorp/hcl v0.0.0-20170509225359-392dba7d905e h1:KJWs1uTCkN3E/J5ofCH9Pf8KKsibTFc3fv0CA9+WsVo=
 github.com/hashicorp/hcl v0.0.0-20170509225359-392dba7d905e/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=
 github.com/magiconair/properties v1.7.3 h1:6AOjgCKyZFMG/1yfReDPDz3CJZPxnYk7DGmj2HtyF24=
@@ -33,14 +31,10 @@ github.com/spf13/viper v0.0.0-20170619124313-c1de95864d73/go.mod h1:A8kyI5cUJhb8
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
 golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
 golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
 golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-google.golang.org/grpc v0.0.0-20160225213019-0f80f5b995e8 h1:lIH/bShL4zFLuTh6S9dwHMkr3Kjik7bcafOT3Kh918w=
-google.golang.org/grpc v0.0.0-20160225213019-0f80f5b995e8/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=

mayday.go

@@ -12,7 +12,6 @@ import (
 	"github.com/flatcar/mayday/mayday/plugins/docker"
 	"github.com/flatcar/mayday/mayday/plugins/file"
 	"github.com/flatcar/mayday/mayday/plugins/journal"
-	"github.com/flatcar/mayday/mayday/plugins/rkt"
 	"github.com/flatcar/mayday/mayday/plugins/symlink"
 	mtar "github.com/flatcar/mayday/mayday/tar"
 	"github.com/flatcar/mayday/mayday/tarable"
@@ -137,12 +136,6 @@ func main() {
 		log.Fatal(err)
 	}
 
-	pods, rktLogs, err := rkt.GetPods()
-	if err != nil {
-		log.Println("Could not connect to rkt. Verify mayday has permissions to launch the rkt client.")
-		log.Printf("Connection error: %s", err)
-	}
-
 	containers, dockerLogs, err := docker.GetContainers()
 	if err != nil {
 		log.Println("Could not connect to docker. Verify mayday has permissions to read /var/lib/docker.")
@@ -198,14 +191,6 @@ func main() {
 		tarables = append(tarables, j)
 	}
 
-	for _, p := range pods {
-		tarables = append(tarables, p)
-	}
-
-	for _, l := range rktLogs {
-		tarables = append(tarables, l)
-	}
-
 	for _, c := range containers {
 		tarables = append(tarables, c)
 	}