Merge pull request #14 from johananl/johananl/update-deps

Update Ignition module references
flatcar · Nov 12, 2021 · b55b8c2 · b55b8c2
2 parents 04d35b1 + 1fc7c61
commit b55b8c2
Show file tree

Hide file tree

Showing 79 changed files with 1,568 additions and 10,524 deletions.
diff --git a/README.md b/README.md
@@ -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
@@ -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)
diff --git a/config/astyaml/astyaml.go b/config/astyaml/astyaml.go
@@ -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"
 )
 

diff --git a/config/config.go b/config/config.go
@@ -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"

diff --git a/config/config_test.go b/config/config_test.go
@@ -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"

diff --git a/config/types/common.go b/config/types/common.go
@@ -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"

diff --git a/config/types/config.go b/config/types/config.go
@@ -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 (

diff --git a/config/types/converter.go b/config/types/converter.go
@@ -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"
 )

diff --git a/config/types/disks.go b/config/types/disks.go
@@ -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 (

diff --git a/config/types/docker.go b/config/types/docker.go
@@ -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 {

diff --git a/config/types/etcd.go b/config/types/etcd.go
@@ -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 (

diff --git a/config/types/files.go b/config/types/files.go
@@ -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"
 )
 

diff --git a/config/types/filesystems.go b/config/types/filesystems.go
@@ -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 {

diff --git a/config/types/flannel.go b/config/types/flannel.go
@@ -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 (

diff --git a/config/types/locksmith.go b/config/types/locksmith.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/ignition/config/validate/report"
+	"github.com/flatcar-linux/ignition/config/validate/report"
 )
 
 var (

diff --git a/config/types/locksmith_test.go b/config/types/locksmith_test.go
@@ -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) {

diff --git a/config/types/networkd.go b/config/types/networkd.go
@@ -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 {

diff --git a/config/types/passwd.go b/config/types/passwd.go
@@ -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 {

diff --git a/config/types/raid.go b/config/types/raid.go
@@ -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 {

diff --git a/config/types/security.go b/config/types/security.go
@@ -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 {

diff --git a/config/types/systemd.go b/config/types/systemd.go
@@ -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 {

diff --git a/config/types/update.go b/config/types/update.go
@@ -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"
 )
 

diff --git a/config/types/update_test.go b/config/types/update_test.go
@@ -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) {

diff --git a/doc/configuration.md b/doc/configuration.md
@@ -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
diff --git a/doc/overview.md b/doc/overview.md
@@ -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?
 

diff --git a/go.mod b/go.mod
@@ -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
-Original file 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 @@