kairos/kairos-agent
1
0
Fork 0
mirror of https://github.com/kairos-io/kairos-agent.git synced 2025-09-19 00:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #181 from kairos-io/1999-consume-versioneer

Browse Source 
1999 consume versioneer
This commit is contained in:
Dimitris Karakasilis
2023-12-08 14:18:25 +02:00
committed by GitHub
parent e6b3e5092e 2412d69e32
commit 05174fed43
4 changed files with 128 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@@ -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.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
@@ -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

8
go.sum
View File

@@ -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.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=
@@ -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=

188
internal/agent/upgrade.go
View File

@@ -1,61 +1,66 @@
package agent
import (
"context"
"encoding/json"
"fmt"
"sort"
"strings"
hook "github.com/kairos-io/kairos-agent/v2/internal/agent/hooks"
"github.com/mudler/go-pluggable"
"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/mudler/go-pluggable"
"github.com/kairos-io/kairos-sdk/versioneer"
)
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")
if err != nil {
return releases
}
fmt.Println("Searching for releases")
if includePrereleases {
fmt.Println("Including pre-releases")
}
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))
registryAndOrg, err := utils.OSRelease("REGISTRY_AND_ORG")
if err != nil {
return "", err
}
return releases
return artifact.ContainerName(registryAndOrg)
}
func ListReleases(includePrereleases bool) ([]string, error) {
var err error
providerTags, err := getReleasesFromProvider(includePrereleases)
if err != nil {
fmt.Printf("warn: %s", err.Error())
}
if len(providerTags) != 0 {
return providerTags, nil
}
tagList, err := newerReleases()
if err != nil {
return []string{}, err
}
if !includePrereleases {
tagList = tagList.NoPrereleases()
}
return tagList.FullImages()
}
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
}
@@ -83,31 +88,28 @@ func Upgrade(
return hook.Run(*c, upgradeSpec, hook.AfterUpgrade...)
}
// 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,
})
func newerReleases() (versioneer.TagList, error) {
artifact, err := versioneer.NewArtifactFromOSRelease()
if err != nil {
return nil, err
return versioneer.TagList{}, err
}
if img != "" {
return v1.NewSrcFromURI(img)
}
registry, err := utils.OSRelease("IMAGE_REPO")
registryAndOrg, err := utils.OSRelease("REGISTRY_AND_ORG")
if err != nil {
return nil, fmt.Errorf("can't find IMAGE_REPO key under /etc/os-release %w", err)
return versioneer.TagList{}, err
}
return v1.NewSrcFromURI(fmt.Sprintf("%s:%s", registry, version))
tagList, err := artifact.TagList(registryAndOrg)
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
}
// generateUpgradeConfForCLIArgs creates a kairos configuration for `--source` and `--recovery`
@@ -140,64 +142,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")
}
releases := ListReleases(preReleases)
if len(releases) == 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()
if utils.Version() == version && !force {
return "", fmt.Errorf("version %s already installed. use --force to force upgrade", version)
}
msg := fmt.Sprintf("Latest release is %s\nAre you sure you want to upgrade to this release? (y/n)", version)
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 version, 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
@@ -218,10 +163,25 @@ 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
}
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
}

73
main.go
View File

@@ -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,9 +26,9 @@ 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"
"github.com/spf13/viper"
"github.com/urfave/cli/v2"
"gopkg.in/yaml.v3"
@@ -37,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
}
}
@@ -62,6 +58,7 @@ var sourceFlag = cli.StringFlag{
var cmds = []*cli.Command{
{
// TODO: Fix the implicit upgrade
Name: "upgrade",
Flags: []cli.Flag{
&cli.BoolFlag{
@@ -79,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"
@@ -102,10 +99,25 @@ 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
}
if len(releases) == 0 {
fmt.Println("No newer releases found")
return nil
}
for _, r := range releases {
fmt.Println(r)
}
return nil
@@ -121,12 +133,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")
@@ -134,8 +152,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"),
)
@@ -211,7 +228,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 +295,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 +345,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 +807,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() {