Skip to content
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

Swap a.Variant and a.Flavor to match new artifact naming scheme #47

Merged
merged 4 commits into from
Nov 15, 2023
Merged

Swap a.Variant and a.Flavor to match new artifact naming scheme #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e69543
Swap `a.Variant` and `a.Flavor` to match new artifact naming scheme
Nov 15, 2023
110fad2
Handle artifact name changes in 2.4.2
mauromorales Nov 15, 2023
3e3f157
Use FlavorRelease instead of FlavorVersion to be consistent
mauromorales Nov 15, 2023
ab532cb
Update tests
mauromorales Nov 15, 2023
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
13 changes: 7 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Check out the full [reference of AuroraBoot in our documentation](https://kairo
For instance, in one machine from your workstation, you can run:

```bash
$ docker run --rm -ti --net host quay.io/kairos/auroraboot --set "artifact_version=v1.5.0" --set "release_version=v1.5.0" --set "flavor=rockylinux" --set repository="kairos-io/kairos" --cloud-config /....
$ docker run --rm -ti --net host quay.io/kairos/auroraboot --set "artifact_version=v2.4.2" --set "release_version=v2.4.2" --set "flavor=rockylinux"--set "flavor_release=9" --set repository="kairos-io/kairos" --cloud-config /....
mauromorales marked this conversation as resolved.
Show resolved Hide resolved
```

And then start machines attempting to boot over network.
Expand All @@ -89,7 +89,7 @@ This command will:
Auroraboot can also boostrap nodes by using custom container images or [the official kairos releases](https://kairos.io/docs/reference/image_matrix/), for instance:

```
docker run -v /var/run/docker.sock:/var/run/docker.sock --rm -ti --net host quay.io/kairos/auroraboot --set container_image=docker://quay.io/kairos/core-rockylinux:v1.5.0
docker run -v /var/run/docker.sock:/var/run/docker.sock --rm -ti --net host quay.io/kairos/auroraboot --set container_image=docker://quay.io/kairos/rockylinux:9-core-amd64-generic-v2.4.2
```

This command will:
Expand All @@ -103,7 +103,7 @@ If you don't have a running docker daemon, Auroraboot can also pull directly fro


```
docker run --rm -ti --net host quay.io/kairos/auroraboot --set container_image=quay.io/kairos/core-rockylinux:v1.5.0
docker run --rm -ti --net host quay.io/kairos/auroraboot --set container_image=quay.io/kairos/rockylinux:9-core-amd64-generic-v2.4.2
```

This command will:
Expand All @@ -116,7 +116,7 @@ This command will:
To disable netboot, and allow only ISO generation (for offline usage), use `--set disable_netboot=true`:

```
docker run -v /var/run/docker.sock:/var/run/docker.sock --rm -ti --net host quay.io/kairos/auroraboot --set container_image=quay.io/kairos/core-rockylinux:v1.5.0 --set disable_netboot=true
docker run -v /var/run/docker.sock:/var/run/docker.sock --rm -ti --net host quay.io/kairos/auroraboot --set container_image=quay.io/kairos/rockylinux:9-core-amd64-generic-v2.4.2 --set disable_netboot=true
```

### Configuration
Expand All @@ -126,10 +126,11 @@ docker run -v /var/run/docker.sock:/var/run/docker.sock --rm -ti --net host quay
A configuration file can be for instance:

```yaml
artifact_version: "v1.5.0"
release_version: "v1.5.0"
artifact_version: "v2.4.2"
release_version: "v2.4.2"
container_image: "..."
flavor: "rockylinux"
flavor_release: "9"
repository: "kairos-io/kairos"

cloud_config: |
Expand Down
5 changes: 3 additions & 2 deletions example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
artifact_version: "v1.5.0"
release_version: "v1.5.0"
artifact_version: "v2.4.2"
release_version: "v2.4.2"
flavor: "rockylinux"
flavor_release: "9"
repository: "kairos-io/kairos"

cloud_config: |
Expand Down
31 changes: 10 additions & 21 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ require (
github.com/cavaliergopher/grab/v3 v3.0.1
github.com/hashicorp/go-multierror v1.1.1
github.com/kairos-io/kairos v1.5.0
github.com/onsi/ginkgo/v2 v2.11.0
github.com/onsi/gomega v1.27.10
github.com/onsi/ginkgo/v2 v2.13.0
github.com/onsi/gomega v1.30.0
github.com/otiai10/copy v1.10.0
github.com/rs/zerolog v1.30.0
github.com/spectrocloud-labs/herd v0.4.2
github.com/spectrocloud/peg v0.0.0-20230407121159-2e15270c4a46
github.com/urfave/cli v1.22.14
go.universe.tf/netboot v0.0.0-20230225040044-0e2ca55deb50
golang.org/x/mod v0.12.0
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0
gopkg.in/yaml.v3 v3.0.1
)
Expand All @@ -22,19 +22,14 @@ require (
atomicgo.dev/cursor v0.1.1 // indirect
atomicgo.dev/keyboard v0.2.9 // indirect
github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59 // indirect
github.com/bramvdbogaerde/go-scp v1.2.0 // indirect
github.com/codingsince1985/checksum v1.2.4 // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/gookit/color v1.5.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/ipfs/go-log v1.0.5 // indirect
github.com/ipfs/go-log/v2 v2.5.1 // indirect
github.com/itchyny/gojq v0.12.11 // indirect
github.com/itchyny/timefmt-go v0.1.5 // indirect
github.com/joho/godotenv v1.4.0 // indirect
Expand All @@ -43,25 +38,19 @@ require (
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/mudler/go-processmanager v0.0.0-20220724164624-c45b5c61312d // indirect
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
github.com/pterm/pterm v0.12.54 // indirect
github.com/qeesung/image2ascii v1.0.1 // indirect
github.com/rivo/uniseg v0.4.3 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/samber/lo v1.37.0 // indirect
github.com/wayneashleyberry/terminal-dimensions v1.1.0 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.23.0 // indirect
golang.org/x/crypto v0.11.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/term v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
golang.org/x/tools v0.9.3 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/tools v0.12.0 // indirect
)
Loading
Loading