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

Update Ignition module references #14

Merged
merged 1 commit into from
Nov 12, 2021
Merged

Update Ignition module references #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ For a more in-depth view of ct and why it exists, take a look at the [Overview][

Please use the [bug tracker][issues] to report bugs.

[ignition]: https://github.com/coreos/ignition
[ignition]: https://github.com/flatcar-linux/ignition
[issues]: https://github.com/flatcar-linux/flatcar/issues
[overview]: doc/overview.md
[get-started]: doc/getting-started.md
Expand Down Expand Up @@ -90,6 +90,6 @@ Note: Review releases for new branch versions.

## Related projects

- [https://github.com/coreos/ignition](https://github.com/coreos/ignition)
- [https://github.com/flatcar-linux/ignition](https://github.com/flatcar-linux/ignition)
- [https://github.com/flatcar-linux/afterburn/](https://github.com/flatcar-linux/afterburn)
- [https://github.com/poseidon/matchbox](https://github.com/poseidon/matchbox)
2 changes: 1 addition & 1 deletion config/astyaml/astyaml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"io"
"strings"

"github.com/coreos/ignition/config/validate/astnode"
"github.com/flatcar-linux/ignition/config/validate/astnode"
yaml "gopkg.in/yaml.v3"
)

Expand Down
8 changes: 4 additions & 4 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package config
import (
"reflect"

ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate"
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/ignition/config/validate/report"
ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
"github.com/flatcar-linux/ignition/config/validate"
"github.com/flatcar-linux/ignition/config/validate/astnode"
"github.com/flatcar-linux/ignition/config/validate/report"
yaml "gopkg.in/yaml.v3"

"github.com/flatcar-linux/container-linux-config-transpiler/config/astyaml"
Expand Down
4 changes: 2 additions & 2 deletions config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"github.com/stretchr/testify/assert"

"github.com/coreos/go-semver/semver"
ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate/report"
ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
"github.com/flatcar-linux/ignition/config/validate/report"

"github.com/flatcar-linux/container-linux-config-transpiler/config/types"
"github.com/flatcar-linux/container-linux-config-transpiler/internal/util"
Expand Down
6 changes: 3 additions & 3 deletions config/types/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"fmt"
"reflect"

ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/ignition/config/validate/report"
ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
"github.com/flatcar-linux/ignition/config/validate/astnode"
"github.com/flatcar-linux/ignition/config/validate/report"

"github.com/flatcar-linux/container-linux-config-transpiler/config/platform"
"github.com/flatcar-linux/container-linux-config-transpiler/config/templating"
Expand Down
6 changes: 3 additions & 3 deletions config/types/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"errors"
"net/url"

ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/ignition/config/validate/report"
ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
"github.com/flatcar-linux/ignition/config/validate/astnode"
"github.com/flatcar-linux/ignition/config/validate/report"
)

var (
Expand Down
8 changes: 4 additions & 4 deletions config/types/converter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package types
import (
"reflect"

ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate"
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/ignition/config/validate/report"
ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
"github.com/flatcar-linux/ignition/config/validate"
"github.com/flatcar-linux/ignition/config/validate/astnode"
"github.com/flatcar-linux/ignition/config/validate/report"

"github.com/flatcar-linux/container-linux-config-transpiler/config/astyaml"
)
Expand Down
6 changes: 3 additions & 3 deletions config/types/disks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"fmt"

"github.com/alecthomas/units"
ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/ignition/config/validate/report"
ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
"github.com/flatcar-linux/ignition/config/validate/astnode"
"github.com/flatcar-linux/ignition/config/validate/report"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions config/types/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"fmt"
"strings"

ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/ignition/config/validate/report"
ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
"github.com/flatcar-linux/ignition/config/validate/astnode"
"github.com/flatcar-linux/ignition/config/validate/report"
)

type Docker struct {
Expand Down
6 changes: 3 additions & 3 deletions config/types/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"fmt"

"github.com/coreos/go-semver/semver"
ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/ignition/config/validate/report"
ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
"github.com/flatcar-linux/ignition/config/validate/astnode"
"github.com/flatcar-linux/ignition/config/validate/report"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions config/types/files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"github.com/flatcar-linux/container-linux-config-transpiler/config/astyaml"
"github.com/flatcar-linux/container-linux-config-transpiler/internal/util"

ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/ignition/config/validate/report"
ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
"github.com/flatcar-linux/ignition/config/validate/astnode"
"github.com/flatcar-linux/ignition/config/validate/report"
"github.com/vincent-petithory/dataurl"
)

Expand Down
6 changes: 3 additions & 3 deletions config/types/filesystems.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
package types

import (
ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/ignition/config/validate/report"
ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
"github.com/flatcar-linux/ignition/config/validate/astnode"
"github.com/flatcar-linux/ignition/config/validate/report"
)

type Filesystem struct {
Expand Down
6 changes: 3 additions & 3 deletions config/types/flannel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"fmt"

"github.com/coreos/go-semver/semver"
ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/ignition/config/validate/report"
ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
"github.com/flatcar-linux/ignition/config/validate/astnode"
"github.com/flatcar-linux/ignition/config/validate/report"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion config/types/locksmith.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"strings"
"time"

"github.com/coreos/ignition/config/validate/report"
"github.com/flatcar-linux/ignition/config/validate/report"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion config/types/locksmith_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"reflect"
"testing"

"github.com/coreos/ignition/config/validate/report"
"github.com/flatcar-linux/ignition/config/validate/report"
)

func TestValidateWindowStart(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions config/types/networkd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
package types

import (
ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/ignition/config/validate/report"
ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
"github.com/flatcar-linux/ignition/config/validate/astnode"
"github.com/flatcar-linux/ignition/config/validate/report"
)

type Networkd struct {
Expand Down
6 changes: 3 additions & 3 deletions config/types/passwd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
package types

import (
ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/ignition/config/validate/report"
ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
"github.com/flatcar-linux/ignition/config/validate/astnode"
"github.com/flatcar-linux/ignition/config/validate/report"
)

type Passwd struct {
Expand Down
6 changes: 3 additions & 3 deletions config/types/raid.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
package types

import (
ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/ignition/config/validate/report"
ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
"github.com/flatcar-linux/ignition/config/validate/astnode"
"github.com/flatcar-linux/ignition/config/validate/report"
)

type Raid struct {
Expand Down
6 changes: 3 additions & 3 deletions config/types/security.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
package types

import (
ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/ignition/config/validate/report"
ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
"github.com/flatcar-linux/ignition/config/validate/astnode"
"github.com/flatcar-linux/ignition/config/validate/report"
)

type Security struct {
Expand Down
6 changes: 3 additions & 3 deletions config/types/systemd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
package types

import (
ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/ignition/config/validate/report"
ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
"github.com/flatcar-linux/ignition/config/validate/astnode"
"github.com/flatcar-linux/ignition/config/validate/report"
)

type Systemd struct {
Expand Down
6 changes: 3 additions & 3 deletions config/types/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (

"github.com/flatcar-linux/container-linux-config-transpiler/internal/util"

ignTypes "github.com/coreos/ignition/config/v2_3/types"
"github.com/coreos/ignition/config/validate/astnode"
"github.com/coreos/ignition/config/validate/report"
ignTypes "github.com/flatcar-linux/ignition/config/v2_3/types"
"github.com/flatcar-linux/ignition/config/validate/astnode"
"github.com/flatcar-linux/ignition/config/validate/report"
"github.com/vincent-petithory/dataurl"
)

Expand Down
2 changes: 1 addition & 1 deletion config/types/update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"reflect"
"testing"

"github.com/coreos/ignition/config/validate/report"
"github.com/flatcar-linux/ignition/config/validate/report"
)

func TestValidateUpdateGroup(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion doc/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,4 @@ _Note: all fields are optional unless otherwise marked_

[part-types]: http://en.wikipedia.org/wiki/GUID_Partition_Table#Partition_type_GUIDs
[rfc2397]: https://tools.ietf.org/html/rfc2397
[ignition-fs-reuse]: https://github.com/coreos/ignition/blob/master/doc/operator-notes.md#filesystem-reuse-semantics
[ignition-fs-reuse]: https://github.com/flatcar-linux/ignition/blob/master/doc/operator-notes.md#filesystem-reuse-semantics
2 changes: 1 addition & 1 deletion doc/overview.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The Container Linux Config is intended to be human-friendly, and is thus in YAML
The resulting Ignition config is very much not intended to be human-friendly. It is an artifact produced by ct that users should simply pass along to their machines. JSON was chosen over a binary format to make the process more transparent and to allow power users to inspect/modify what ct produces, but it would have worked fine if the result from ct had not been human readable at all.

[ct]: https://github.com/flatcar-linux/container-linux-config-transpiler/
[ignition]: https://github.com/coreos/ignition
[ignition]: https://github.com/flatcar-linux/ignition

## Why a two-step process?

Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ require (
github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15
github.com/coreos/go-semver v0.3.0
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
github.com/coreos/ignition v0.35.0
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/stretchr/testify v1.4.0
github.com/flatcar-linux/ignition v0.36.1
github.com/stretchr/testify v1.7.0
github.com/vincent-petithory/dataurl v1.0.0
go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
Expand Down
Loading