From faedd0fbaef1e44848d3f137aeb29681e2d5f9e1 Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Mon, 4 Dec 2023 17:52:13 +0200 Subject: [PATCH 1/6] Embed verioneer cli commands and fix duplicate command aliases Signed-off-by: Mauro Morales Signed-off-by: Dimitris Karakasilis --- go.mod | 4 ++-- go.sum | 8 ++++---- main.go | 18 +++++++++++++----- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 9c160f0..dfaec1b 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 github.com/jaypipes/ghw v0.12.0 github.com/joho/godotenv v1.5.1 - github.com/kairos-io/kairos-sdk v0.0.17 + github.com/kairos-io/kairos-sdk v0.0.18 github.com/labstack/echo/v4 v4.11.1 github.com/mitchellh/mapstructure v1.5.0 github.com/mudler/go-nodepair v0.0.0-20221223092639-ba399a66fdfb @@ -28,7 +28,7 @@ require ( github.com/sirupsen/logrus v1.9.3 github.com/spf13/viper v1.16.0 github.com/twpayne/go-vfs v1.7.2 - github.com/urfave/cli/v2 v2.25.7 + github.com/urfave/cli/v2 v2.26.0 golang.org/x/net v0.15.0 golang.org/x/oauth2 v0.12.0 gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 diff --git a/go.sum b/go.sum index 6247bb1..16c0ce3 100644 --- a/go.sum +++ b/go.sum @@ -355,8 +355,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kairos-io/kairos-sdk v0.0.17 h1:rBdtONkkRoIxtenB6BYb7Sir1Ss2yveSobyC7wC/fYU= -github.com/kairos-io/kairos-sdk v0.0.17/go.mod h1:6Y9RGvKU/B99euFE32OYrabLLsSVjjemCfyRgiEHuKE= +github.com/kairos-io/kairos-sdk v0.0.18 h1:eV4pf91MTG1Kho1AiA+9C4JnV9g/yvpyLy1g4JRtOEI= +github.com/kairos-io/kairos-sdk v0.0.18/go.mod h1:17dpFG2d3Q/TcT86DlLK5nNXEjlSrkYl7bsvO2cpYGE= github.com/kbinani/screenshot v0.0.0-20210720154843-7d3a670d8329 h1:qq2nCpSrXrmvDGRxW0ruW9BVEV1CN2a9YDOExdt+U0o= github.com/kbinani/screenshot v0.0.0-20210720154843-7d3a670d8329/go.mod h1:2VPVQDR4wO7KXHwP+DAypEy67rXf+okUx2zjgpCxZw4= github.com/kendru/darwin/go/depgraph v0.0.0-20221105232959-877d6a81060c h1:eKb4PqwAMhlqwXw0W3atpKaYaPGlXE/Fwh+xpCEYaPk= @@ -617,8 +617,8 @@ github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0o github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8= -github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs= -github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= +github.com/urfave/cli/v2 v2.26.0 h1:3f3AMg3HpThFNT4I++TKOejZO8yU55t3JnnSr4S4QEI= +github.com/urfave/cli/v2 v2.26.0/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= diff --git a/main.go b/main.go index 3574a24..b1b335a 100644 --- a/main.go +++ b/main.go @@ -5,14 +5,15 @@ import ( "encoding/json" "errors" "fmt" - "github.com/kairos-io/kairos-agent/v2/pkg/action" - "github.com/kairos-io/kairos-agent/v2/pkg/utils" "os" "path/filepath" "regexp" "runtime" "strings" + "github.com/kairos-io/kairos-agent/v2/pkg/action" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" + "github.com/kairos-io/kairos-agent/v2/internal/agent" "github.com/kairos-io/kairos-agent/v2/internal/bus" "github.com/kairos-io/kairos-agent/v2/internal/common" @@ -25,6 +26,7 @@ import ( "github.com/kairos-io/kairos-sdk/machine" "github.com/kairos-io/kairos-sdk/schema" "github.com/kairos-io/kairos-sdk/state" + "github.com/kairos-io/kairos-sdk/versioneer" "github.com/sirupsen/logrus" "github.com/Masterminds/semver/v3" @@ -211,7 +213,7 @@ Manually installs a kairos bundle. E.g. kairos-agent install-bundle container:quay.io/kairos/kairos... `, - Aliases: []string{"i"}, + Aliases: []string{}, Flags: []cli.Flag{ &cli.StringFlag{ Name: "repository", @@ -278,7 +280,7 @@ E.g. kairos-agent install-bundle container:quay.io/kairos/kairos... Name: "show", Usage: "Shows the machine configuration", Description: "Show the runtime configuration of the machine. It will scan the machine for all the configuration and will return the config file processed and found.", - Aliases: []string{"s"}, + Aliases: []string{}, Action: func(c *cli.Context) error { config, err := agentConfig.Scan(collector.Directories(configScanDir...), collector.NoLogs) if err != nil { @@ -328,7 +330,7 @@ enabled: true`, Name: "state", Usage: "get machine state", Description: "Print machine state information, e.g. `state get uuid` returns the machine uuid", - Aliases: []string{"s"}, + Aliases: []string{}, Action: func(c *cli.Context) error { runtime, err := state.NewRuntime() if err != nil { @@ -790,6 +792,12 @@ The validate command expects a configuration file as its only argument. Local fi }, }, }, + { + Name: "versioneer", + Usage: "versioneer subcommands", + Description: "versioneer subcommands", + Subcommands: versioneer.CliCommands(), + }, } func main() { From 823343546ad6834849ed5b5a8d5dd8f214f67ef7 Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Thu, 7 Dec 2023 15:00:04 +0200 Subject: [PATCH 2/6] Fix "upgrade list-releases" command by consuming kairos-sdk versioneer Also add TODOs for remaining work Signed-off-by: Dimitris Karakasilis --- go.mod | 2 +- go.sum | 28 +++++++++ internal/agent/upgrade.go | 126 ++++++++++++++++++++++++++++---------- main.go | 30 ++++----- 4 files changed, 138 insertions(+), 48 deletions(-) diff --git a/go.mod b/go.mod index dfaec1b..67f423a 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 github.com/jaypipes/ghw v0.12.0 github.com/joho/godotenv v1.5.1 - github.com/kairos-io/kairos-sdk v0.0.18 + github.com/kairos-io/kairos-sdk v0.0.19-0.20231207121804-e1bdef3f0376 github.com/labstack/echo/v4 v4.11.1 github.com/mitchellh/mapstructure v1.5.0 github.com/mudler/go-nodepair v0.0.0-20221223092639-ba399a66fdfb diff --git a/go.sum b/go.sum index 16c0ce3..a90a39b 100644 --- a/go.sum +++ b/go.sum @@ -96,6 +96,7 @@ github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiE github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bool64/dev v0.2.31 h1:OS57EqYaYe2M/2bw9uhDCIFiZZwywKFS/4qMLN6JUmQ= github.com/bool64/shared v0.1.5 h1:fp3eUhBsrSjNCQPcSdQqZxxh9bBwrYiZ+zOKFkM0/2E= github.com/cavaliergopher/grab v2.0.0+incompatible h1:XLeGNAc7MIRTMb8RlRbN76uO8vx1/AeNMWWN7FYpDw8= @@ -119,6 +120,7 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/containerd/aufs v1.0.0/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= @@ -128,13 +130,16 @@ github.com/containerd/containerd v1.7.7 h1:QOC2K4A42RQpcrZyptP6z9EJZnlHfHJUfZrAA github.com/containerd/containerd v1.7.7/go.mod h1:3c4XZv6VeT9qgf9GMTxNTMFxGJrGpI2vz1yk4ye+YY8= github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM= github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= +github.com/containerd/go-runc v1.0.0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/containerd/stargz-snapshotter/estargz v0.14.3 h1:OqlDCK3ZVUO6C3B/5FSkDwbkEETK84kQgEeFwDC+62k= github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o= +github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= @@ -166,6 +171,8 @@ github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryef github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= +github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/eliukblau/pixterm v1.3.1 h1:XeouQViH+lmzCa7sMUoK2cd7qlgHYGLIjwRKaOdJbKA= @@ -239,6 +246,7 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -357,6 +365,14 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kairos-io/kairos-sdk v0.0.18 h1:eV4pf91MTG1Kho1AiA+9C4JnV9g/yvpyLy1g4JRtOEI= github.com/kairos-io/kairos-sdk v0.0.18/go.mod h1:17dpFG2d3Q/TcT86DlLK5nNXEjlSrkYl7bsvO2cpYGE= +github.com/kairos-io/kairos-sdk v0.0.19-0.20231206164003-9329da6912e4 h1:mDUCoO7nXwFH8ACu3xAnv8PjYcV3jgEGDl/nswbD2mk= +github.com/kairos-io/kairos-sdk v0.0.19-0.20231206164003-9329da6912e4/go.mod h1:17dpFG2d3Q/TcT86DlLK5nNXEjlSrkYl7bsvO2cpYGE= +github.com/kairos-io/kairos-sdk v0.0.19-0.20231207072547-fb16b6efa3b7 h1:mh2J0Cf7ztZDz6g9Blk7OOc9OD8w5T5LOHn5111dcTE= +github.com/kairos-io/kairos-sdk v0.0.19-0.20231207072547-fb16b6efa3b7/go.mod h1:17dpFG2d3Q/TcT86DlLK5nNXEjlSrkYl7bsvO2cpYGE= +github.com/kairos-io/kairos-sdk v0.0.19-0.20231207080125-c57b1a8ff31a h1:O8nd6G2jw304OtTimtaRJEVF+Ha4BRPASlQKlXcH5Zo= +github.com/kairos-io/kairos-sdk v0.0.19-0.20231207080125-c57b1a8ff31a/go.mod h1:17dpFG2d3Q/TcT86DlLK5nNXEjlSrkYl7bsvO2cpYGE= +github.com/kairos-io/kairos-sdk v0.0.19-0.20231207121804-e1bdef3f0376 h1:PpWh6NDJ+kuQncClfg+hmzAhNSLcEfA0jfpKANA3XEM= +github.com/kairos-io/kairos-sdk v0.0.19-0.20231207121804-e1bdef3f0376/go.mod h1:17dpFG2d3Q/TcT86DlLK5nNXEjlSrkYl7bsvO2cpYGE= github.com/kbinani/screenshot v0.0.0-20210720154843-7d3a670d8329 h1:qq2nCpSrXrmvDGRxW0ruW9BVEV1CN2a9YDOExdt+U0o= github.com/kbinani/screenshot v0.0.0-20210720154843-7d3a670d8329/go.mod h1:2VPVQDR4wO7KXHwP+DAypEy67rXf+okUx2zjgpCxZw4= github.com/kendru/darwin/go/depgraph v0.0.0-20221105232959-877d6a81060c h1:eKb4PqwAMhlqwXw0W3atpKaYaPGlXE/Fwh+xpCEYaPk= @@ -388,6 +404,7 @@ github.com/labstack/echo/v4 v4.11.1 h1:dEpLU2FLg4UVmvCGPuk/APjlH6GDpbEPti61srUUU github.com/labstack/echo/v4 v4.11.1/go.mod h1:YuYRTSM3CHs2ybfrL8Px48bO6BAnYIN4l8wSTMP6BDQ= github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8= github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= +github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo= github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8LFgLN4= github.com/lithammer/fuzzysearch v1.1.8/go.mod h1:IdqeyBClc3FFqSzYq/MXESsS4S0FsZ5ajtkr5xPLts4= github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= @@ -428,6 +445,7 @@ github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/moby v23.0.2+incompatible h1:W9l+1HGV+mZ4a6RW9ZAHzSYPpqAZ96/ft5gFJAaeh9c= github.com/moby/moby v23.0.2+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78= @@ -435,7 +453,9 @@ github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGp github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc= github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo= github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mudler/entities v0.0.0-20220905203055-68348bae0f49 h1:P1QgHLh0hX935j6m9K6rlSxc0mkD1UuIAOQEu+1VCW4= github.com/mudler/entities v0.0.0-20220905203055-68348bae0f49/go.mod h1:qquFT9tYp+/NO7tTotto4BT9zSRYSMDxo2PGZwujpFA= github.com/mudler/go-nodepair v0.0.0-20221223092639-ba399a66fdfb h1:F6TP0DW7C0U9sgm9g4uAs0Vp2JSkhn2umlyrNlxUKXw= @@ -487,6 +507,7 @@ github.com/packethost/packngo v0.29.0/go.mod h1:/UHguFdPs6Lf6FOkkSEPnRY5tgS0fsVM github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= +github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/phayes/permbits v0.0.0-20190612203442-39d7c581d2ee h1:P6U24L02WMfj9ymZTxl7CxS73JC99x3ukk+DBkgQGQs= github.com/phayes/permbits v0.0.0-20190612203442-39d7c581d2ee/go.mod h1:3uODdxMgOaPYeWU7RzZLxVtJHZ/x1f/iHkBZuKJDzuY= github.com/pierrec/lz4 v2.3.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= @@ -583,6 +604,7 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= +github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= @@ -607,6 +629,7 @@ github.com/swaggest/jsonschema-go v0.3.62 h1:eIE0aRklWa2eLJg2L/zqyWpKvgUPbq2oKOt github.com/swaggest/jsonschema-go v0.3.62/go.mod h1:DYuKqdpms/edvywsX6p1zHXCZkdwB28wRaBdFCe3Duw= github.com/swaggest/refl v1.3.0 h1:PEUWIku+ZznYfsoyheF97ypSduvMApYyGkYF3nabS0I= github.com/swaggest/refl v1.3.0/go.mod h1:3Ujvbmh1pfSbDYjC6JGG7nMgPvpG0ehQL4iNonnLNbg= +github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tredoe/osutil/v2 v2.0.0-rc.16 h1:5A2SKvyB2c3lhPYUIHyFtu6jbaXlaA3Hu5gWIam8Pik= github.com/tredoe/osutil/v2 v2.0.0-rc.16/go.mod h1:uLRVx/3pb7Y4RQhG8cQFbPE9ha5r81e6MXpBsxbTAYc= @@ -640,6 +663,7 @@ github.com/willdonnelly/passwd v0.0.0-20141013001024-7935dab3074c/go.mod h1:xcvf github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= github.com/xanzy/ssh-agent v0.3.1 h1:AmzO1SSWxw73zxFZPRwaMN1MohDw8UyHnmuxyceTEGo= github.com/xanzy/ssh-agent v0.3.1/go.mod h1:QIE4lCeL7nkC25x+yA3LBIYfwCc1TFziCtG7cBAac6w= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= @@ -657,6 +681,7 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t github.com/zcalusic/sysinfo v1.0.1 h1:cVh8q3codjh43AGRTa54dJ2Zq+qPejv8n2VWpxKViwc= github.com/zcalusic/sysinfo v1.0.1/go.mod h1:LxwKwtQdbTIQc65drhjQzYzt0o7jfB80LrrZm7SWn8o= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -1073,11 +1098,13 @@ gopkg.in/djherbis/times.v1 v1.3.0 h1:uxMS4iMtH6Pwsxog094W0FYldiNnfY/xba00vq6C2+o gopkg.in/djherbis/times.v1 v1.3.0/go.mod h1:AQlg6unIsrsCEdQYhTzERy542dz6SFdQFZFv6mUY0P8= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473/go.mod h1:N1eN2tsCx0Ydtgjl4cqmbRCsY4/+z4cYDeqwZTk6zog= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= @@ -1097,6 +1124,7 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= +gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/internal/agent/upgrade.go b/internal/agent/upgrade.go index 5402cac..34f3476 100644 --- a/internal/agent/upgrade.go +++ b/internal/agent/upgrade.go @@ -1,54 +1,77 @@ package agent import ( - "context" "encoding/json" "fmt" - "sort" "strings" hook "github.com/kairos-io/kairos-agent/v2/internal/agent/hooks" - "github.com/Masterminds/semver/v3" "github.com/kairos-io/kairos-agent/v2/internal/bus" "github.com/kairos-io/kairos-agent/v2/pkg/action" config "github.com/kairos-io/kairos-agent/v2/pkg/config" - "github.com/kairos-io/kairos-agent/v2/pkg/github" v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" events "github.com/kairos-io/kairos-sdk/bus" "github.com/kairos-io/kairos-sdk/collector" "github.com/kairos-io/kairos-sdk/utils" + "github.com/kairos-io/kairos-sdk/versioneer" "github.com/mudler/go-pluggable" ) -func ListReleases(includePrereleases bool) semver.Collection { - var releases semver.Collection - - bus.Manager.Response(events.EventAvailableReleases, func(p *pluggable.Plugin, r *pluggable.EventResponse) { - if err := json.Unmarshal([]byte(r.Data), &releases); err != nil { - fmt.Printf("warn: failed unmarshalling data: '%s'\n", err.Error()) - } - }) - - if _, err := bus.Manager.Publish(events.EventAvailableReleases, events.EventPayload{}); err != nil { - fmt.Printf("warn: failed publishing event: '%s'\n", err.Error()) +func CurrentImage() (string, error) { + artifact, err := versioneer.NewArtifactFromOSRelease() + if err != nil { + return "", fmt.Errorf("creating an Artifact from os-release: %w", err) } - if len(releases) == 0 { - githubRepo, err := utils.OSRelease("GITHUB_REPO") + registryAndOrg, err := utils.OSRelease("REGISTRY_AND_ORG") + if err != nil { + return "", err + } + + return artifact.ContainerName(registryAndOrg) +} + +func ListReleases(includePrereleases bool) (versioneer.TagList, error) { + var tagList versioneer.TagList + var err error + + // TODO: Re-enable when the provider also consumes versioneer + // TODO: Somehow pass includePrereleases to the provider? + // bus.Manager.Response(events.EventAvailableReleases, func(p *pluggable.Plugin, r *pluggable.EventResponse) { + // if err := json.Unmarshal([]byte(r.Data), &tagList); err != nil { + // fmt.Printf("warn: failed unmarshalling data: '%s'\n", err.Error()) + // } + // }) + + // if _, err := bus.Manager.Publish(events.EventAvailableReleases, events.EventPayload{}); err != nil { + // fmt.Printf("warn: failed publishing event: '%s'\n", err.Error()) + // } + + // Sort before we filter + // // We got the release list from the bus manager and we don't know if they are sorted, so sort them in reverse to get the latest first + // // TODO: Should we sort? Maybe it's better to leave the sorting to the provider. Maybe there is custom logic baked in and + // // we mess with it? Our provider can definitely do the same kind of sorting because it uses the same versioneer library. + // sort.Sort(sort.Reverse(&tagList)) + + tagList = versioneer.TagList{} // This will come from the provider-kairos above + + if len(tagList.Tags) == 0 { + tagList, err = newerReleases() if err != nil { - return releases + return tagList, err } - fmt.Println("Searching for releases") - if includePrereleases { - fmt.Println("Including pre-releases") + + if !includePrereleases { + tagList = tagList.NoPrereleases() } - releases, _ = github.FindReleases(context.Background(), "", githubRepo, includePrereleases) - } else { - // We got the release list from the bus manager and we don't know if they are sorted, so sort them in reverse to get the latest first - sort.Sort(sort.Reverse(releases)) } - return releases + + if len(tagList.Tags) == 0 { + fmt.Println("No newer releases found") + } + + return tagList, nil } func Upgrade( @@ -83,6 +106,25 @@ func Upgrade( return hook.Run(*c, upgradeSpec, hook.AfterUpgrade...) } +func newerReleases() (versioneer.TagList, error) { + artifact, err := versioneer.NewArtifactFromOSRelease() + if err != nil { + return versioneer.TagList{}, err + } + + registryAndOrg, err := utils.OSRelease("REGISTRY_AND_ORG") + if err != nil { + return versioneer.TagList{}, err + } + + tagList, err := artifact.TagList(registryAndOrg) + if err != nil { + return tagList, err + } + + return tagList.NewerAnyVersion().RSorted(), nil +} + // determineUpgradeImage asks the provider plugin for an image or constructs // it using version and data from /etc/os-release func determineUpgradeImage(version string) (*v1.ImageSource, error) { @@ -172,20 +214,38 @@ func findLatestVersion(preReleases, force bool) (string, error) { if preReleases { fmt.Println("Including pre-releases") } - releases := ListReleases(preReleases) + tagList, err := ListReleases(preReleases) + if err != nil { + return "", err + } - if len(releases) == 0 { + if len(tagList.Tags) == 0 { return "", fmt.Errorf("no releases found") } // Using Original here because the parsing removes the v as its a semver. But it stores the original full version there - version := releases[0].Original() + image := tagList.Tags[0] - if utils.Version() == version && !force { - return "", fmt.Errorf("version %s already installed. use --force to force upgrade", version) + // TODO: Construct an Artifact from os-release and get the ContainerName. + // Then compare that to the "tag" + currentArtifact, err := versioneer.NewArtifactFromOSRelease() + if err != nil { + return "", err + } + registryAndOrg, err := utils.OSRelease("REGISTRY_AND_ORG") // TODO: merge this in the sdk + if err != nil { + return "", err + } + currentImage, err := currentArtifact.ContainerName(registryAndOrg) + if err != nil { + return "", err } - msg := fmt.Sprintf("Latest release is %s\nAre you sure you want to upgrade to this release? (y/n)", version) + if currentImage == image && !force { + return "", fmt.Errorf("image %s already installed. use --force to force upgrade", image) + } + + msg := fmt.Sprintf("Latest release is %s\nAre you sure you want to upgrade to this release? (y/n)", image) reply, err := promptBool(events.YAMLPrompt{Prompt: msg, Default: "y"}) if err != nil { return "", err @@ -194,7 +254,7 @@ func findLatestVersion(preReleases, force bool) (string, error) { return "", fmt.Errorf("cancelled by the user") } - return version, nil + return image, nil } func generateUpgradeSpec(version, sourceImageURL string, force, strictValidations bool, dirs []string, preReleases, upgradeRecovery bool) (*v1.UpgradeSpec, *config.Config, error) { diff --git a/main.go b/main.go index b1b335a..0e8c006 100644 --- a/main.go +++ b/main.go @@ -29,7 +29,6 @@ import ( "github.com/kairos-io/kairos-sdk/versioneer" "github.com/sirupsen/logrus" - "github.com/Masterminds/semver/v3" "github.com/spf13/viper" "github.com/urfave/cli/v2" "gopkg.in/yaml.v3" @@ -39,21 +38,16 @@ var configScanDir = []string{"/oem", "/usr/local/cloud-config", "/run/initramfs/ // ReleasesToOutput gets a semver.Collection and outputs it in the given format // Only used here. -func ReleasesToOutput(rels semver.Collection, output string) []string { - // Set them back to their original version number with the v in front - var stringRels []string - for _, v := range rels { - stringRels = append(stringRels, v.Original()) - } +func ReleasesToOutput(rels []string, output string) []string { switch strings.ToLower(output) { case "yaml": - d, _ := yaml.Marshal(stringRels) + d, _ := yaml.Marshal(rels) return []string{string(d)} case "json": - d, _ := json.Marshal(stringRels) + d, _ := json.Marshal(rels) return []string{string(d)} default: - return stringRels + return rels } } @@ -64,6 +58,7 @@ var sourceFlag = cli.StringFlag{ var cmds = []*cli.Command{ { + // TODO: Fix the implicit upgrade Name: "upgrade", Flags: []cli.Flag{ &cli.BoolFlag{ @@ -104,11 +99,18 @@ See https://kairos.io/docs/upgrade/manual/ for documentation. Name: "list-releases", Description: `List all available releases versions`, Action: func(c *cli.Context) error { - releases := agent.ListReleases(c.Bool("pre")) - list := ReleasesToOutput(releases, c.String("output")) - for _, i := range list { - fmt.Println(i) + currentImage, err := agent.CurrentImage() + if err != nil { + return err } + fmt.Printf("Current image:\n%s\n\n", currentImage) + + fmt.Println("Available releases with higher versions:") + releases, err := agent.ListReleases(c.Bool("pre")) + if err != nil { + return err + } + releases.PrintImages() return nil }, From 691224a05326fa06e0d1563e9205332fdaf79473 Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Thu, 7 Dec 2023 15:47:21 +0200 Subject: [PATCH 3/6] Deprecate positional version in `kairos-agent upgrade` command Signed-off-by: Dimitris Karakasilis --- main.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index 0e8c006..4e1a211 100644 --- a/main.go +++ b/main.go @@ -76,9 +76,9 @@ var cmds = []*cli.Command{ Description: ` Manually upgrade a kairos node Active image. Does not upgrade passive or recovery images. -By default takes no arguments, defaulting to latest available release, to specify a version, pass it as argument: - -$ kairos upgrade v1.20.... +With no arguments, it defaults to latest available release. To specify a version, pass it as argument using the --source flag. +Passing just the Kairos version as the first argument is no longer supported. If you speficy a positional argument, it will be treated +as a value for the --source flag. To retrieve all the available versions, use "kairos upgrade list-releases" @@ -127,6 +127,8 @@ See https://kairos.io/docs/upgrade/manual/ for documentation. var v string if c.Args().Len() == 1 { v = c.Args().First() + fmt.Println("Warning: Passing a version as a positional argument is deprecated. Use --source flag instead.") + fmt.Println("The value will be used as a value for the --source flag") } image := c.String("image") From 678393195669cd1b22f0d7c5c2af0d6add389c8c Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Thu, 7 Dec 2023 18:18:34 +0200 Subject: [PATCH 4/6] go mod tidy Signed-off-by: Dimitris Karakasilis --- go.sum | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/go.sum b/go.sum index a90a39b..34ef23c 100644 --- a/go.sum +++ b/go.sum @@ -96,7 +96,6 @@ github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiE github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bool64/dev v0.2.31 h1:OS57EqYaYe2M/2bw9uhDCIFiZZwywKFS/4qMLN6JUmQ= github.com/bool64/shared v0.1.5 h1:fp3eUhBsrSjNCQPcSdQqZxxh9bBwrYiZ+zOKFkM0/2E= github.com/cavaliergopher/grab v2.0.0+incompatible h1:XLeGNAc7MIRTMb8RlRbN76uO8vx1/AeNMWWN7FYpDw8= @@ -120,7 +119,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/containerd/aufs v1.0.0/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= @@ -130,16 +128,13 @@ github.com/containerd/containerd v1.7.7 h1:QOC2K4A42RQpcrZyptP6z9EJZnlHfHJUfZrAA github.com/containerd/containerd v1.7.7/go.mod h1:3c4XZv6VeT9qgf9GMTxNTMFxGJrGpI2vz1yk4ye+YY8= github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM= github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= -github.com/containerd/go-runc v1.0.0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/containerd/stargz-snapshotter/estargz v0.14.3 h1:OqlDCK3ZVUO6C3B/5FSkDwbkEETK84kQgEeFwDC+62k= github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o= -github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= @@ -171,8 +166,6 @@ github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryef github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= -github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= -github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/eliukblau/pixterm v1.3.1 h1:XeouQViH+lmzCa7sMUoK2cd7qlgHYGLIjwRKaOdJbKA= @@ -246,7 +239,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -363,14 +355,6 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kairos-io/kairos-sdk v0.0.18 h1:eV4pf91MTG1Kho1AiA+9C4JnV9g/yvpyLy1g4JRtOEI= -github.com/kairos-io/kairos-sdk v0.0.18/go.mod h1:17dpFG2d3Q/TcT86DlLK5nNXEjlSrkYl7bsvO2cpYGE= -github.com/kairos-io/kairos-sdk v0.0.19-0.20231206164003-9329da6912e4 h1:mDUCoO7nXwFH8ACu3xAnv8PjYcV3jgEGDl/nswbD2mk= -github.com/kairos-io/kairos-sdk v0.0.19-0.20231206164003-9329da6912e4/go.mod h1:17dpFG2d3Q/TcT86DlLK5nNXEjlSrkYl7bsvO2cpYGE= -github.com/kairos-io/kairos-sdk v0.0.19-0.20231207072547-fb16b6efa3b7 h1:mh2J0Cf7ztZDz6g9Blk7OOc9OD8w5T5LOHn5111dcTE= -github.com/kairos-io/kairos-sdk v0.0.19-0.20231207072547-fb16b6efa3b7/go.mod h1:17dpFG2d3Q/TcT86DlLK5nNXEjlSrkYl7bsvO2cpYGE= -github.com/kairos-io/kairos-sdk v0.0.19-0.20231207080125-c57b1a8ff31a h1:O8nd6G2jw304OtTimtaRJEVF+Ha4BRPASlQKlXcH5Zo= -github.com/kairos-io/kairos-sdk v0.0.19-0.20231207080125-c57b1a8ff31a/go.mod h1:17dpFG2d3Q/TcT86DlLK5nNXEjlSrkYl7bsvO2cpYGE= github.com/kairos-io/kairos-sdk v0.0.19-0.20231207121804-e1bdef3f0376 h1:PpWh6NDJ+kuQncClfg+hmzAhNSLcEfA0jfpKANA3XEM= github.com/kairos-io/kairos-sdk v0.0.19-0.20231207121804-e1bdef3f0376/go.mod h1:17dpFG2d3Q/TcT86DlLK5nNXEjlSrkYl7bsvO2cpYGE= github.com/kbinani/screenshot v0.0.0-20210720154843-7d3a670d8329 h1:qq2nCpSrXrmvDGRxW0ruW9BVEV1CN2a9YDOExdt+U0o= @@ -404,7 +388,6 @@ github.com/labstack/echo/v4 v4.11.1 h1:dEpLU2FLg4UVmvCGPuk/APjlH6GDpbEPti61srUUU github.com/labstack/echo/v4 v4.11.1/go.mod h1:YuYRTSM3CHs2ybfrL8Px48bO6BAnYIN4l8wSTMP6BDQ= github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8= github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= -github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo= github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8LFgLN4= github.com/lithammer/fuzzysearch v1.1.8/go.mod h1:IdqeyBClc3FFqSzYq/MXESsS4S0FsZ5ajtkr5xPLts4= github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= @@ -445,7 +428,6 @@ github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/moby v23.0.2+incompatible h1:W9l+1HGV+mZ4a6RW9ZAHzSYPpqAZ96/ft5gFJAaeh9c= github.com/moby/moby v23.0.2+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78= @@ -453,9 +435,7 @@ github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGp github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc= github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo= github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= -github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mudler/entities v0.0.0-20220905203055-68348bae0f49 h1:P1QgHLh0hX935j6m9K6rlSxc0mkD1UuIAOQEu+1VCW4= github.com/mudler/entities v0.0.0-20220905203055-68348bae0f49/go.mod h1:qquFT9tYp+/NO7tTotto4BT9zSRYSMDxo2PGZwujpFA= github.com/mudler/go-nodepair v0.0.0-20221223092639-ba399a66fdfb h1:F6TP0DW7C0U9sgm9g4uAs0Vp2JSkhn2umlyrNlxUKXw= @@ -507,7 +487,6 @@ github.com/packethost/packngo v0.29.0/go.mod h1:/UHguFdPs6Lf6FOkkSEPnRY5tgS0fsVM github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= -github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/phayes/permbits v0.0.0-20190612203442-39d7c581d2ee h1:P6U24L02WMfj9ymZTxl7CxS73JC99x3ukk+DBkgQGQs= github.com/phayes/permbits v0.0.0-20190612203442-39d7c581d2ee/go.mod h1:3uODdxMgOaPYeWU7RzZLxVtJHZ/x1f/iHkBZuKJDzuY= github.com/pierrec/lz4 v2.3.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= @@ -604,7 +583,6 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= -github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= @@ -629,7 +607,6 @@ github.com/swaggest/jsonschema-go v0.3.62 h1:eIE0aRklWa2eLJg2L/zqyWpKvgUPbq2oKOt github.com/swaggest/jsonschema-go v0.3.62/go.mod h1:DYuKqdpms/edvywsX6p1zHXCZkdwB28wRaBdFCe3Duw= github.com/swaggest/refl v1.3.0 h1:PEUWIku+ZznYfsoyheF97ypSduvMApYyGkYF3nabS0I= github.com/swaggest/refl v1.3.0/go.mod h1:3Ujvbmh1pfSbDYjC6JGG7nMgPvpG0ehQL4iNonnLNbg= -github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tredoe/osutil/v2 v2.0.0-rc.16 h1:5A2SKvyB2c3lhPYUIHyFtu6jbaXlaA3Hu5gWIam8Pik= github.com/tredoe/osutil/v2 v2.0.0-rc.16/go.mod h1:uLRVx/3pb7Y4RQhG8cQFbPE9ha5r81e6MXpBsxbTAYc= @@ -663,7 +640,6 @@ github.com/willdonnelly/passwd v0.0.0-20141013001024-7935dab3074c/go.mod h1:xcvf github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= github.com/xanzy/ssh-agent v0.3.1 h1:AmzO1SSWxw73zxFZPRwaMN1MohDw8UyHnmuxyceTEGo= github.com/xanzy/ssh-agent v0.3.1/go.mod h1:QIE4lCeL7nkC25x+yA3LBIYfwCc1TFziCtG7cBAac6w= -github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= @@ -681,7 +657,6 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t github.com/zcalusic/sysinfo v1.0.1 h1:cVh8q3codjh43AGRTa54dJ2Zq+qPejv8n2VWpxKViwc= github.com/zcalusic/sysinfo v1.0.1/go.mod h1:LxwKwtQdbTIQc65drhjQzYzt0o7jfB80LrrZm7SWn8o= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -1098,13 +1073,11 @@ gopkg.in/djherbis/times.v1 v1.3.0 h1:uxMS4iMtH6Pwsxog094W0FYldiNnfY/xba00vq6C2+o gopkg.in/djherbis/times.v1 v1.3.0/go.mod h1:AQlg6unIsrsCEdQYhTzERy542dz6SFdQFZFv6mUY0P8= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473/go.mod h1:N1eN2tsCx0Ydtgjl4cqmbRCsY4/+z4cYDeqwZTk6zog= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= @@ -1124,7 +1097,6 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= -gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From 00ce75b285c2f981ec05cb1056455cf8997eda87 Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Thu, 7 Dec 2023 18:20:16 +0200 Subject: [PATCH 5/6] Deprecate positional argument and cleanup unused code because empty source caused an error, because of Sanitize() failing. handleEmptySource was never called. Signed-off-by: Dimitris Karakasilis --- internal/agent/upgrade.go | 129 +++++++------------------------------- main.go | 9 ++- 2 files changed, 30 insertions(+), 108 deletions(-) diff --git a/internal/agent/upgrade.go b/internal/agent/upgrade.go index 34f3476..1d8072d 100644 --- a/internal/agent/upgrade.go +++ b/internal/agent/upgrade.go @@ -11,11 +11,9 @@ import ( "github.com/kairos-io/kairos-agent/v2/pkg/action" config "github.com/kairos-io/kairos-agent/v2/pkg/config" v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" - events "github.com/kairos-io/kairos-sdk/bus" "github.com/kairos-io/kairos-sdk/collector" "github.com/kairos-io/kairos-sdk/utils" "github.com/kairos-io/kairos-sdk/versioneer" - "github.com/mudler/go-pluggable" ) func CurrentImage() (string, error) { @@ -75,10 +73,10 @@ func ListReleases(includePrereleases bool) (versioneer.TagList, error) { } func Upgrade( - version, source string, force, strictValidations bool, dirs []string, preReleases, upgradeRecovery bool) error { + source string, force, strictValidations bool, dirs []string, preReleases, upgradeRecovery bool) error { bus.Manager.Initialize() - upgradeSpec, c, err := generateUpgradeSpec(version, source, force, strictValidations, dirs, preReleases, upgradeRecovery) + upgradeSpec, c, err := generateUpgradeSpec(source, force, strictValidations, dirs, preReleases, upgradeRecovery) if err != nil { return err } @@ -125,32 +123,33 @@ func newerReleases() (versioneer.TagList, error) { return tagList.NewerAnyVersion().RSorted(), nil } +// TODO: Remove the releavant hook from the provider-kairos too? // determineUpgradeImage asks the provider plugin for an image or constructs // it using version and data from /etc/os-release -func determineUpgradeImage(version string) (*v1.ImageSource, error) { - var img string - bus.Manager.Response(events.EventVersionImage, func(p *pluggable.Plugin, r *pluggable.EventResponse) { - img = r.Data - }) +// func determineUpgradeImage(version string) (*v1.ImageSource, error) { +// var img string +// bus.Manager.Response(events.EventVersionImage, func(p *pluggable.Plugin, r *pluggable.EventResponse) { +// img = r.Data +// }) - _, err := bus.Manager.Publish(events.EventVersionImage, &events.VersionImagePayload{ - Version: version, - }) - if err != nil { - return nil, err - } +// _, err := bus.Manager.Publish(events.EventVersionImage, &events.VersionImagePayload{ +// Version: version, +// }) +// if err != nil { +// return nil, err +// } - if img != "" { - return v1.NewSrcFromURI(img) - } +// if img != "" { +// return v1.NewSrcFromURI(img) +// } - registry, err := utils.OSRelease("IMAGE_REPO") - if err != nil { - return nil, fmt.Errorf("can't find IMAGE_REPO key under /etc/os-release %w", err) - } +// registry, err := utils.OSRelease("IMAGE_REPO") +// if err != nil { +// return nil, fmt.Errorf("can't find IMAGE_REPO key under /etc/os-release %w", err) +// } - return v1.NewSrcFromURI(fmt.Sprintf("%s:%s", registry, version)) -} +// return v1.NewSrcFromURI(fmt.Sprintf("%s:%s", registry, version)) +// } // generateUpgradeConfForCLIArgs creates a kairos configuration for `--source` and `--recovery` // command line arguments. It will be added to the rest of the configurations. @@ -182,82 +181,7 @@ func generateUpgradeConfForCLIArgs(source string, upgradeRecovery bool) (string, return string(d), err } -func handleEmptySource(spec *v1.UpgradeSpec, version string, preReleases, force bool) error { - var err error - if spec.RecoveryUpgrade { - if spec.Recovery.Source.IsEmpty() { - spec.Recovery.Source, err = getLatestOrConstructSource(version, preReleases, force) - } - } else { - if spec.Active.Source.IsEmpty() { - spec.Active.Source, err = getLatestOrConstructSource(version, preReleases, force) - } - } - - return err -} - -func getLatestOrConstructSource(version string, preReleases, force bool) (*v1.ImageSource, error) { - var err error - if version == "" { - version, err = findLatestVersion(preReleases, force) - if err != nil { - return nil, err - } - } - - return determineUpgradeImage(version) -} - -func findLatestVersion(preReleases, force bool) (string, error) { - fmt.Println("Searching for releases") - if preReleases { - fmt.Println("Including pre-releases") - } - tagList, err := ListReleases(preReleases) - if err != nil { - return "", err - } - - if len(tagList.Tags) == 0 { - return "", fmt.Errorf("no releases found") - } - - // Using Original here because the parsing removes the v as its a semver. But it stores the original full version there - image := tagList.Tags[0] - - // TODO: Construct an Artifact from os-release and get the ContainerName. - // Then compare that to the "tag" - currentArtifact, err := versioneer.NewArtifactFromOSRelease() - if err != nil { - return "", err - } - registryAndOrg, err := utils.OSRelease("REGISTRY_AND_ORG") // TODO: merge this in the sdk - if err != nil { - return "", err - } - currentImage, err := currentArtifact.ContainerName(registryAndOrg) - if err != nil { - return "", err - } - - if currentImage == image && !force { - return "", fmt.Errorf("image %s already installed. use --force to force upgrade", image) - } - - msg := fmt.Sprintf("Latest release is %s\nAre you sure you want to upgrade to this release? (y/n)", image) - reply, err := promptBool(events.YAMLPrompt{Prompt: msg, Default: "y"}) - if err != nil { - return "", err - } - if reply == "false" { - return "", fmt.Errorf("cancelled by the user") - } - - return image, nil -} - -func generateUpgradeSpec(version, sourceImageURL string, force, strictValidations bool, dirs []string, preReleases, upgradeRecovery bool) (*v1.UpgradeSpec, *config.Config, error) { +func generateUpgradeSpec(sourceImageURL string, force, strictValidations bool, dirs []string, preReleases, upgradeRecovery bool) (*v1.UpgradeSpec, *config.Config, error) { cliConf, err := generateUpgradeConfForCLIArgs(sourceImageURL, upgradeRecovery) if err != nil { return nil, nil, err @@ -278,10 +202,5 @@ func generateUpgradeSpec(version, sourceImageURL string, force, strictValidation return nil, nil, err } - err = handleEmptySource(upgradeSpec, version, preReleases, force) - if err != nil { - return nil, nil, err - } - return upgradeSpec, c, nil } diff --git a/main.go b/main.go index 4e1a211..84dfc75 100644 --- a/main.go +++ b/main.go @@ -125,14 +125,18 @@ See https://kairos.io/docs/upgrade/manual/ for documentation. }, Action: func(c *cli.Context) error { var v string + var source string if c.Args().Len() == 1 { v = c.Args().First() fmt.Println("Warning: Passing a version as a positional argument is deprecated. Use --source flag instead.") fmt.Println("The value will be used as a value for the --source flag") + source = v } image := c.String("image") - source := c.String("source") + if v := c.String("source"); v != "" { + source = c.String("source") + } if image != "" { fmt.Println("--image flag is deprecated, please use --source") @@ -140,8 +144,7 @@ See https://kairos.io/docs/upgrade/manual/ for documentation. source = fmt.Sprintf("oci:%s", image) } - return agent.Upgrade( - v, source, c.Bool("force"), + return agent.Upgrade(source, c.Bool("force"), c.Bool("strict-validation"), configScanDir, c.Bool("pre"), c.Bool("recovery"), ) From 2412d69e326b528c3e9d15d83c6a197aaf6b9501 Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Fri, 8 Dec 2023 10:50:01 +0200 Subject: [PATCH 6/6] Re-enable call-out to provider for releases Signed-off-by: Dimitris Karakasilis --- go.mod | 2 +- go.sum | 4 +- internal/agent/upgrade.go | 105 ++++++++++++++++---------------------- main.go | 10 +++- 4 files changed, 55 insertions(+), 66 deletions(-) diff --git a/go.mod b/go.mod index 67f423a..2f354dc 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 github.com/jaypipes/ghw v0.12.0 github.com/joho/godotenv v1.5.1 - github.com/kairos-io/kairos-sdk v0.0.19-0.20231207121804-e1bdef3f0376 + github.com/kairos-io/kairos-sdk v0.0.19-0.20231208070330-4aaf17c01269 github.com/labstack/echo/v4 v4.11.1 github.com/mitchellh/mapstructure v1.5.0 github.com/mudler/go-nodepair v0.0.0-20221223092639-ba399a66fdfb diff --git a/go.sum b/go.sum index 34ef23c..87f06f9 100644 --- a/go.sum +++ b/go.sum @@ -355,8 +355,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kairos-io/kairos-sdk v0.0.19-0.20231207121804-e1bdef3f0376 h1:PpWh6NDJ+kuQncClfg+hmzAhNSLcEfA0jfpKANA3XEM= -github.com/kairos-io/kairos-sdk v0.0.19-0.20231207121804-e1bdef3f0376/go.mod h1:17dpFG2d3Q/TcT86DlLK5nNXEjlSrkYl7bsvO2cpYGE= +github.com/kairos-io/kairos-sdk v0.0.19-0.20231208070330-4aaf17c01269 h1:7qBdzwCCvgxBXQW6xYF5+KJAD1UJvaYO7EZuZLNm1io= +github.com/kairos-io/kairos-sdk v0.0.19-0.20231208070330-4aaf17c01269/go.mod h1:17dpFG2d3Q/TcT86DlLK5nNXEjlSrkYl7bsvO2cpYGE= github.com/kbinani/screenshot v0.0.0-20210720154843-7d3a670d8329 h1:qq2nCpSrXrmvDGRxW0ruW9BVEV1CN2a9YDOExdt+U0o= github.com/kbinani/screenshot v0.0.0-20210720154843-7d3a670d8329/go.mod h1:2VPVQDR4wO7KXHwP+DAypEy67rXf+okUx2zjgpCxZw4= github.com/kendru/darwin/go/depgraph v0.0.0-20221105232959-877d6a81060c h1:eKb4PqwAMhlqwXw0W3atpKaYaPGlXE/Fwh+xpCEYaPk= diff --git a/internal/agent/upgrade.go b/internal/agent/upgrade.go index 1d8072d..4f873cf 100644 --- a/internal/agent/upgrade.go +++ b/internal/agent/upgrade.go @@ -6,11 +6,13 @@ import ( "strings" hook "github.com/kairos-io/kairos-agent/v2/internal/agent/hooks" + "github.com/mudler/go-pluggable" "github.com/kairos-io/kairos-agent/v2/internal/bus" "github.com/kairos-io/kairos-agent/v2/pkg/action" config "github.com/kairos-io/kairos-agent/v2/pkg/config" v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + events "github.com/kairos-io/kairos-sdk/bus" "github.com/kairos-io/kairos-sdk/collector" "github.com/kairos-io/kairos-sdk/utils" "github.com/kairos-io/kairos-sdk/versioneer" @@ -30,46 +32,28 @@ func CurrentImage() (string, error) { return artifact.ContainerName(registryAndOrg) } -func ListReleases(includePrereleases bool) (versioneer.TagList, error) { - var tagList versioneer.TagList +func ListReleases(includePrereleases bool) ([]string, error) { var err error - // TODO: Re-enable when the provider also consumes versioneer - // TODO: Somehow pass includePrereleases to the provider? - // bus.Manager.Response(events.EventAvailableReleases, func(p *pluggable.Plugin, r *pluggable.EventResponse) { - // if err := json.Unmarshal([]byte(r.Data), &tagList); err != nil { - // fmt.Printf("warn: failed unmarshalling data: '%s'\n", err.Error()) - // } - // }) - - // if _, err := bus.Manager.Publish(events.EventAvailableReleases, events.EventPayload{}); err != nil { - // fmt.Printf("warn: failed publishing event: '%s'\n", err.Error()) - // } - - // Sort before we filter - // // We got the release list from the bus manager and we don't know if they are sorted, so sort them in reverse to get the latest first - // // TODO: Should we sort? Maybe it's better to leave the sorting to the provider. Maybe there is custom logic baked in and - // // we mess with it? Our provider can definitely do the same kind of sorting because it uses the same versioneer library. - // sort.Sort(sort.Reverse(&tagList)) - - tagList = versioneer.TagList{} // This will come from the provider-kairos above - - if len(tagList.Tags) == 0 { - tagList, err = newerReleases() - if err != nil { - return tagList, err - } - - if !includePrereleases { - tagList = tagList.NoPrereleases() - } + providerTags, err := getReleasesFromProvider(includePrereleases) + if err != nil { + fmt.Printf("warn: %s", err.Error()) } - if len(tagList.Tags) == 0 { - fmt.Println("No newer releases found") + if len(providerTags) != 0 { + return providerTags, nil } - return tagList, nil + tagList, err := newerReleases() + if err != nil { + return []string{}, err + } + + if !includePrereleases { + tagList = tagList.NoPrereleases() + } + + return tagList.FullImages() } func Upgrade( @@ -119,38 +103,15 @@ func newerReleases() (versioneer.TagList, error) { if err != nil { return tagList, err } + //fmt.Printf("tagList.OtherAnyVersion() = %#v\n", tagList.OtherAnyVersion().Tags) + //fmt.Printf("tagList.Images() = %#v\n", tagList.Images().Tags) + // fmt.Println("Tags") + // tagList.NewerAnyVersion().Print() + // fmt.Println("---------------------------") return tagList.NewerAnyVersion().RSorted(), nil } -// TODO: Remove the releavant hook from the provider-kairos too? -// determineUpgradeImage asks the provider plugin for an image or constructs -// it using version and data from /etc/os-release -// func determineUpgradeImage(version string) (*v1.ImageSource, error) { -// var img string -// bus.Manager.Response(events.EventVersionImage, func(p *pluggable.Plugin, r *pluggable.EventResponse) { -// img = r.Data -// }) - -// _, err := bus.Manager.Publish(events.EventVersionImage, &events.VersionImagePayload{ -// Version: version, -// }) -// if err != nil { -// return nil, err -// } - -// if img != "" { -// return v1.NewSrcFromURI(img) -// } - -// registry, err := utils.OSRelease("IMAGE_REPO") -// if err != nil { -// return nil, fmt.Errorf("can't find IMAGE_REPO key under /etc/os-release %w", err) -// } - -// return v1.NewSrcFromURI(fmt.Sprintf("%s:%s", registry, version)) -// } - // generateUpgradeConfForCLIArgs creates a kairos configuration for `--source` and `--recovery` // command line arguments. It will be added to the rest of the configurations. func generateUpgradeConfForCLIArgs(source string, upgradeRecovery bool) (string, error) { @@ -204,3 +165,23 @@ func generateUpgradeSpec(sourceImageURL string, force, strictValidations bool, d return upgradeSpec, c, nil } + +func getReleasesFromProvider(includePrereleases bool) ([]string, error) { + var result []string + bus.Manager.Response(events.EventAvailableReleases, func(p *pluggable.Plugin, r *pluggable.EventResponse) { + if r.Data == "" { + return + } + if err := json.Unmarshal([]byte(r.Data), &result); err != nil { + fmt.Printf("warn: failed unmarshalling data: '%s'\n", err.Error()) + } + }) + + configYAML := "IncludePreReleases: true" + _, err := bus.Manager.Publish(events.EventAvailableReleases, events.EventPayload{Config: configYAML}) + if err != nil { + return result, fmt.Errorf("failed publishing event: %w", err) + } + + return result, nil +} diff --git a/main.go b/main.go index 84dfc75..4ab7f25 100644 --- a/main.go +++ b/main.go @@ -110,7 +110,15 @@ See https://kairos.io/docs/upgrade/manual/ for documentation. if err != nil { return err } - releases.PrintImages() + + if len(releases) == 0 { + fmt.Println("No newer releases found") + return nil + } + + for _, r := range releases { + fmt.Println(r) + } return nil },