Skip to content

Commit

Permalink
mod: revendor latest ignition, stabilize 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@prestist
prestist committed Nov 21, 2024
1 parent da4b8a1 commit e37ee9c
Show file tree
Hide file tree
Showing 44 changed files with 53 additions and 54 deletions.
2 changes: 1 addition & 1 deletion base/v0_6_exp/translate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

"github.com/coreos/go-systemd/v22/unit"
"github.com/coreos/ignition/v2/config/util"
"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/coreos/vcontext/path"
"github.com/coreos/vcontext/report"
)
Expand Down
30 changes: 15 additions & 15 deletions base/v0_6_exp/translate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/coreos/butane/translate"

"github.com/coreos/ignition/v2/config/util"
"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/coreos/vcontext/path"
"github.com/coreos/vcontext/report"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -816,7 +816,7 @@ func TestTranslateMountUnit(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -881,7 +881,7 @@ RequiredBy=local-fs.target`),
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -945,7 +945,7 @@ RequiredBy=remote-fs.target`),
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -1007,7 +1007,7 @@ RequiredBy=local-fs.target`),
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -1078,7 +1078,7 @@ RequiredBy=remote-fs.target`),
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -1115,7 +1115,7 @@ RequiredBy=remote-fs.target`),
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -1157,7 +1157,7 @@ RequiredBy=swap.target`),
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -1744,7 +1744,7 @@ func TestTranslateIgnition(t *testing.T) {
{
Ignition{},
types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
},
{
Expand All @@ -1761,7 +1761,7 @@ func TestTranslateIgnition(t *testing.T) {
},
},
types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
Config: types.IgnitionConfig{
Merge: []types.Resource{
{
Expand All @@ -1784,7 +1784,7 @@ func TestTranslateIgnition(t *testing.T) {
},
},
types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
Proxy: types.Proxy{
HTTPProxy: util.StrToPtr("https://example.com:8080"),
NoProxy: []types.NoProxyItem{types.NoProxyItem("example.com")},
Expand All @@ -1804,7 +1804,7 @@ func TestTranslateIgnition(t *testing.T) {
},
},
types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
Security: types.Security{
TLS: types.TLS{
CertificateAuthorities: []types.Resource{
Expand Down Expand Up @@ -1856,7 +1856,7 @@ func TestTranslateKernelArguments(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
KernelArguments: types.KernelArguments{
ShouldExist: []types.KernelArgument{
Expand Down Expand Up @@ -1916,7 +1916,7 @@ func TestTranslateTang(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -2346,7 +2346,7 @@ func TestToIgn3_5(t *testing.T) {
Config{},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion base/v0_6_exp/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package v0_6_exp

import (
"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
)

type nodeTracker struct {
Expand Down
2 changes: 1 addition & 1 deletion config/fcos/v1_6_exp/translate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/coreos/butane/translate"

"github.com/coreos/ignition/v2/config/util"
"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/coreos/vcontext/path"
"github.com/coreos/vcontext/report"
)
Expand Down
24 changes: 12 additions & 12 deletions config/fcos/v1_6_exp/translate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/coreos/butane/translate"

"github.com/coreos/ignition/v2/config/util"
"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/coreos/vcontext/path"
"github.com/coreos/vcontext/report"
"github.com/stretchr/testify/assert"
Expand All @@ -46,7 +46,7 @@ func TestTranslateBootDevice(t *testing.T) {
Config{},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
},
[]translate.Translation{
Expand Down Expand Up @@ -89,7 +89,7 @@ func TestTranslateBootDevice(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Disks: []types.Disk{
Expand Down Expand Up @@ -164,7 +164,7 @@ func TestTranslateBootDevice(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Luks: []types.Luks{
Expand Down Expand Up @@ -235,7 +235,7 @@ func TestTranslateBootDevice(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Luks: []types.Luks{
Expand Down Expand Up @@ -298,7 +298,7 @@ func TestTranslateBootDevice(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Disks: []types.Disk{
Expand Down Expand Up @@ -544,7 +544,7 @@ func TestTranslateBootDevice(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Disks: []types.Disk{
Expand Down Expand Up @@ -822,7 +822,7 @@ func TestTranslateBootDevice(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Disks: []types.Disk{
Expand Down Expand Up @@ -1046,7 +1046,7 @@ func TestTranslateBootDevice(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Disks: []types.Disk{
Expand Down Expand Up @@ -1280,7 +1280,7 @@ func TestTranslateBootDevice(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Disks: []types.Disk{
Expand Down Expand Up @@ -1545,7 +1545,7 @@ func TestTranslateGrub(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -1593,7 +1593,7 @@ func TestTranslateGrub(t *testing.T) {
},
types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down
2 changes: 1 addition & 1 deletion config/fiot/v1_1_exp/translate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/coreos/butane/config/common"
cutil "github.com/coreos/butane/config/util"

"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/coreos/vcontext/report"
)

Expand Down
2 changes: 1 addition & 1 deletion config/flatcar/v1_2_exp/translate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/coreos/butane/config/common"
cutil "github.com/coreos/butane/config/util"

"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/coreos/vcontext/report"
)

Expand Down
2 changes: 1 addition & 1 deletion config/flatcar/v1_2_exp/translate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func TestTranslation(t *testing.T) {
},
},
},
[]entry{}, // Clevis support was added in 1_2_experimental and we therefore expect no errors.
[]entry{}, // Clevis support was added in 1_2 and we therefore expect no errors.
},
}

Expand Down
2 changes: 1 addition & 1 deletion config/openshift/v4_18_exp/result/schema.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package result

import (
"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion config/openshift/v4_18_exp/translate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/coreos/butane/translate"

"github.com/coreos/ignition/v2/config/util"
"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/coreos/vcontext/path"
"github.com/coreos/vcontext/report"
)
Expand Down
8 changes: 4 additions & 4 deletions config/openshift/v4_18_exp/translate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/coreos/butane/translate"

"github.com/coreos/ignition/v2/config/util"
"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/coreos/vcontext/path"
"github.com/coreos/vcontext/report"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -84,7 +84,7 @@ func TestTranslateConfig(t *testing.T) {
Spec: result.Spec{
Config: types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
},
},
Expand Down Expand Up @@ -159,7 +159,7 @@ func TestTranslateConfig(t *testing.T) {
Spec: result.Spec{
Config: types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down Expand Up @@ -304,7 +304,7 @@ func TestTranslateConfig(t *testing.T) {
Spec: result.Spec{
Config: types.Config{
Ignition: types.Ignition{
Version: "3.5.0-experimental",
Version: "3.5.0",
},
Storage: types.Storage{
Filesystems: []types.Filesystem{
Expand Down
2 changes: 1 addition & 1 deletion config/r4e/v1_2_exp/translate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/coreos/butane/config/common"
cutil "github.com/coreos/butane/config/util"

"github.com/coreos/ignition/v2/config/v3_5_experimental/types"
"github.com/coreos/ignition/v2/config/v3_5/types"
"github.com/coreos/vcontext/report"
)

Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/clarketm/json v1.17.1
github.com/coreos/go-semver v0.3.1
github.com/coreos/go-systemd/v22 v22.5.0
github.com/coreos/ignition/v2 v2.19.0
github.com/coreos/ignition/v2 v2.20.0
github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
github.com/stretchr/testify v1.9.0
Expand All @@ -15,7 +15,7 @@ require (
)

require (
github.com/aws/aws-sdk-go v1.53.5 // indirect
github.com/aws/aws-sdk-go v1.55.5 // indirect
github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/kr/pretty v0.3.1 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github.com/aws/aws-sdk-go v1.53.5 h1:1OcVWMjGlwt7EU5OWmmEEXqaYfmX581EK317QJZXItM=
github.com/aws/aws-sdk-go v1.53.5/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
github.com/clarketm/json v1.17.1 h1:U1IxjqJkJ7bRK4L6dyphmoO840P6bdhPdbbLySourqI=
github.com/clarketm/json v1.17.1/go.mod h1:ynr2LRfb0fQU34l07csRNBTcivjySLLiY1YzQqKVfdo=
github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb h1:rmqyI19j3Z/74bIRhuC59RB442rXUazKNueVpfJPxg4=
Expand All @@ -8,8 +8,8 @@ github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr
github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/coreos/ignition/v2 v2.19.0 h1:ek200E31M1NCVyvL22Bd40kOJp7yt1gdHAb3xwqTi8Y=
github.com/coreos/ignition/v2 v2.19.0/go.mod h1:ydb815SaH9A4304wIUoCS5IHyKRHWEp7dfJH8cQW2gA=
github.com/coreos/ignition/v2 v2.20.0 h1:xQjrxhCbcSKpqrN2hOQavAc1rx0GOf6qh2QCauScwPU=
github.com/coreos/ignition/v2 v2.20.0/go.mod h1:l7EpXNWA7jBXmjUMvnVBlrrj+LX2wA/PAyD9kstwFDQ=
github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 h1:uSmlDgJGbUB0bwQBcZomBTottKwEDF5fF8UjSwKSzWM=
github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687/go.mod h1:Salmysdw7DAVuobBW/LwsKKgpyCPHUhjyJoMJD+ZJiI=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
Expand Down
Loading

0 comments on commit e37ee9c

Please sign in to comment.