diff --git a/changelog/updates/2026-08-26-ignition.md b/changelog/updates/2026-08-26-ignition.md new file mode 100644 index 00000000000..e68625ea221 --- /dev/null +++ b/changelog/updates/2026-08-26-ignition.md @@ -0,0 +1 @@ +- Ignition ([2.26.0](https://coreos.github.io/ignition/release-notes/#ignition-2260-2026-02-17) (includes [2.25.1](https://coreos.github.io/ignition/release-notes/#ignition-2260-2026-02-17), [2.25.0](https://coreos.github.io/ignition/release-notes/#ignition-2250-2025-12-11))) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/Manifest index bc82804358f..7ebc5c7880b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/Manifest @@ -1 +1 @@ -DIST ignition-2.24.0.tar.gz 8569157 BLAKE2B ffc97b24ff723955eb1b03cade7ef16bbcc544ef89730895148019d50869c381525398ae4b253976601ce17ad4d7436a844cd1011c2d17b07efa9802a11b1d23 SHA512 45316c9ae10588ab6615e719d3ab8096ac67320d7c046c6777f502637fd05f1b9aecd00dddec352d18cfdd537c0a4f5fb42160b4697deccd401b67a8939fabd3 +DIST ignition-2.26.0.tar.gz 8519852 BLAKE2B 9194fa46b604c2ecb29fc74e9acbd63998c0331e59ffe71aca789dd4a3e036a6021e67d7085b28f52510b0d76f79c8934adb6d44f17b45a2685c500399d47a9c SHA512 365072e3b9d11be9e0e6008d2e7fbff5a6583f393a9b1860d95ee4bccde1680306d0d063e844dd1ea59968ea4661105210d9c17cf6001a9c1d04a1861505406e diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch index 28a2f64f046..f5a791b5d74 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch @@ -1,12 +1,12 @@ -From ed686434658d0f1835f4bcc9231677af537e779f Mon Sep 17 00:00:00 2001 +From 4f647ad0f7b8e997b321e843d7a2c77eadf4caa3 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Tue, 12 Aug 2025 15:04:40 +0200 -Subject: [PATCH 01/20] *: sed `s/coreos/flatcar/` +Date: Thu, 20 Aug 2026 14:14:07 +0200 +Subject: [PATCH 01/19] *: sed `s/coreos/flatcar/` Signed-off-by: Mathieu Tortuyaux --- config/config.go | 4 +- - config/config_test.go | 16 ++--- + config/config_test.go | 18 +++--- config/doc/generate.go | 2 +- config/doc/schema.go | 2 +- config/merge/merge.go | 6 +- @@ -253,57 +253,102 @@ Signed-off-by: Mathieu Tortuyaux config/v3_5/types/url_test.go | 4 +- config/v3_5/types/verification.go | 2 +- config/v3_5/types/verification_test.go | 2 +- - config/v3_6_experimental/config.go | 14 ++--- - config/v3_6_experimental/config_test.go | 4 +- - .../v3_6_experimental/translate/translate.go | 8 +-- + config/v3_6/config.go | 14 ++--- + config/v3_6/config_test.go | 4 +- + config/v3_6/translate/translate.go | 8 +-- + config/v3_6/translate/translate_test.go | 4 +- + config/v3_6/types/cex.go | 2 +- + config/v3_6/types/cex_test.go | 2 +- + config/v3_6/types/clevis.go | 4 +- + config/v3_6/types/clevis_test.go | 4 +- + config/v3_6/types/config.go | 4 +- + config/v3_6/types/config_test.go | 4 +- + config/v3_6/types/disk.go | 4 +- + config/v3_6/types/file.go | 4 +- + config/v3_6/types/file_test.go | 4 +- + config/v3_6/types/filesystem.go | 4 +- + config/v3_6/types/filesystem_test.go | 4 +- + config/v3_6/types/headers.go | 2 +- + config/v3_6/types/headers_test.go | 2 +- + config/v3_6/types/ignition.go | 2 +- + config/v3_6/types/kargs_test.go | 2 +- + config/v3_6/types/luks.go | 4 +- + config/v3_6/types/mode.go | 2 +- + config/v3_6/types/mode_test.go | 4 +- + config/v3_6/types/node.go | 4 +- + config/v3_6/types/node_test.go | 4 +- + config/v3_6/types/partition.go | 4 +- + config/v3_6/types/partition_test.go | 4 +- + config/v3_6/types/path.go | 4 +- + config/v3_6/types/path_test.go | 2 +- + config/v3_6/types/proxy.go | 2 +- + config/v3_6/types/proxy_test.go | 4 +- + config/v3_6/types/raid.go | 4 +- + config/v3_6/types/raid_test.go | 4 +- + config/v3_6/types/resource.go | 4 +- + config/v3_6/types/storage.go | 4 +- + config/v3_6/types/storage_test.go | 4 +- + config/v3_6/types/systemd.go | 6 +- + config/v3_6/types/systemd_test.go | 4 +- + config/v3_6/types/tang.go | 4 +- + config/v3_6/types/tang_test.go | 4 +- + config/v3_6/types/unit.go | 8 +-- + config/v3_6/types/unit_test.go | 4 +- + config/v3_6/types/url.go | 4 +- + config/v3_6/types/url_test.go | 4 +- + config/v3_6/types/verification.go | 2 +- + config/v3_6/types/verification_test.go | 2 +- + config/v3_7_experimental/config.go | 14 ++--- + config/v3_7_experimental/config_test.go | 4 +- + .../v3_7_experimental/translate/translate.go | 6 +- .../translate/translate_test.go | 4 +- - config/v3_6_experimental/types/cex.go | 2 +- - config/v3_6_experimental/types/cex_test.go | 2 +- - config/v3_6_experimental/types/clevis.go | 4 +- - config/v3_6_experimental/types/clevis_test.go | 4 +- - config/v3_6_experimental/types/config.go | 4 +- - config/v3_6_experimental/types/config_test.go | 4 +- - config/v3_6_experimental/types/disk.go | 4 +- - config/v3_6_experimental/types/file.go | 4 +- - config/v3_6_experimental/types/file_test.go | 4 +- - config/v3_6_experimental/types/filesystem.go | 4 +- + config/v3_7_experimental/types/cex.go | 2 +- + config/v3_7_experimental/types/cex_test.go | 2 +- + config/v3_7_experimental/types/clevis.go | 4 +- + config/v3_7_experimental/types/clevis_test.go | 4 +- + config/v3_7_experimental/types/config.go | 4 +- + config/v3_7_experimental/types/config_test.go | 4 +- + config/v3_7_experimental/types/disk.go | 4 +- + config/v3_7_experimental/types/file.go | 4 +- + config/v3_7_experimental/types/file_test.go | 4 +- + config/v3_7_experimental/types/filesystem.go | 4 +- .../types/filesystem_test.go | 4 +- - config/v3_6_experimental/types/headers.go | 2 +- - .../v3_6_experimental/types/headers_test.go | 2 +- - config/v3_6_experimental/types/ignition.go | 2 +- - config/v3_6_experimental/types/kargs_test.go | 2 +- - config/v3_6_experimental/types/luks.go | 4 +- - config/v3_6_experimental/types/mode.go | 2 +- - config/v3_6_experimental/types/mode_test.go | 4 +- - config/v3_6_experimental/types/node.go | 4 +- - config/v3_6_experimental/types/node_test.go | 4 +- - config/v3_6_experimental/types/partition.go | 4 +- - .../v3_6_experimental/types/partition_test.go | 4 +- - config/v3_6_experimental/types/path.go | 4 +- - config/v3_6_experimental/types/path_test.go | 2 +- - config/v3_6_experimental/types/proxy.go | 2 +- - config/v3_6_experimental/types/proxy_test.go | 4 +- - config/v3_6_experimental/types/raid.go | 4 +- - config/v3_6_experimental/types/raid_test.go | 4 +- - config/v3_6_experimental/types/resource.go | 4 +- - config/v3_6_experimental/types/storage.go | 4 +- - .../v3_6_experimental/types/storage_test.go | 4 +- - config/v3_6_experimental/types/systemd.go | 6 +- - .../v3_6_experimental/types/systemd_test.go | 4 +- - config/v3_6_experimental/types/tang.go | 4 +- - config/v3_6_experimental/types/tang_test.go | 4 +- - config/v3_6_experimental/types/unit.go | 8 +-- - config/v3_6_experimental/types/unit_test.go | 4 +- - config/v3_6_experimental/types/url.go | 4 +- - config/v3_6_experimental/types/url_test.go | 4 +- - .../v3_6_experimental/types/verification.go | 2 +- + config/v3_7_experimental/types/headers.go | 2 +- + .../v3_7_experimental/types/headers_test.go | 2 +- + config/v3_7_experimental/types/ignition.go | 2 +- + config/v3_7_experimental/types/kargs_test.go | 2 +- + config/v3_7_experimental/types/luks.go | 4 +- + config/v3_7_experimental/types/mode.go | 2 +- + config/v3_7_experimental/types/mode_test.go | 4 +- + config/v3_7_experimental/types/node.go | 4 +- + config/v3_7_experimental/types/node_test.go | 4 +- + config/v3_7_experimental/types/partition.go | 4 +- + .../v3_7_experimental/types/partition_test.go | 4 +- + config/v3_7_experimental/types/path.go | 4 +- + config/v3_7_experimental/types/path_test.go | 2 +- + config/v3_7_experimental/types/proxy.go | 2 +- + config/v3_7_experimental/types/proxy_test.go | 4 +- + config/v3_7_experimental/types/raid.go | 4 +- + config/v3_7_experimental/types/raid_test.go | 4 +- + config/v3_7_experimental/types/resource.go | 4 +- + config/v3_7_experimental/types/storage.go | 4 +- + .../v3_7_experimental/types/storage_test.go | 4 +- + config/v3_7_experimental/types/systemd.go | 6 +- + .../v3_7_experimental/types/systemd_test.go | 4 +- + config/v3_7_experimental/types/tang.go | 4 +- + config/v3_7_experimental/types/tang_test.go | 4 +- + config/v3_7_experimental/types/unit.go | 8 +-- + config/v3_7_experimental/types/unit_test.go | 4 +- + config/v3_7_experimental/types/url.go | 4 +- + config/v3_7_experimental/types/url_test.go | 4 +- + .../v3_7_experimental/types/verification.go | 2 +- .../types/verification_test.go | 2 +- config/validate/validate.go | 4 +- config/validate/validate_test.go | 2 +- go.mod | 2 +- internal/apply/apply.go | 30 +++++----- internal/distro/distro.go | 2 +- - internal/doc/main.go | 16 ++--- + internal/doc/main.go | 18 +++--- internal/exec/config_fetcher.go | 18 +++--- internal/exec/engine.go | 22 +++---- internal/exec/stages/disks/disks.go | 16 ++--- @@ -318,7 +363,7 @@ Signed-off-by: Mathieu Tortuyaux internal/exec/stages/files/files_test.go | 4 +- .../exec/stages/files/filesystemEntries.go | 12 ++-- internal/exec/stages/files/passwd.go | 4 +- - internal/exec/stages/files/units.go | 10 ++-- + internal/exec/stages/files/units.go | 12 ++-- internal/exec/stages/files/units_test.go | 4 +- internal/exec/stages/kargs/kargs.go | 14 ++--- internal/exec/stages/mount/mount.go | 16 ++--- @@ -351,6 +396,7 @@ Signed-off-by: Mathieu Tortuyaux internal/providers/kubevirt/kubevirt.go | 14 ++--- internal/providers/metal/metal.go | 8 +-- internal/providers/nutanix/nutanix.go | 14 ++--- + .../nvidiabluefield/nvidiabluefield.go | 10 ++-- internal/providers/openstack/openstack.go | 16 ++--- internal/providers/oraclecloud/oraclecloud.go | 8 +-- internal/providers/packet/packet.go | 8 +-- @@ -369,10 +415,10 @@ Signed-off-by: Mathieu Tortuyaux .../providers/vmware/vmware_unsupported.go | 6 +- internal/providers/vultr/vultr.go | 8 +-- internal/providers/zvm/zvm.go | 14 ++--- - internal/register/providers.go | 58 +++++++++---------- + internal/register/providers.go | 60 +++++++++---------- internal/register/stages.go | 14 ++--- - internal/resource/http.go | 12 ++-- - internal/resource/url.go | 6 +- + internal/resource/http.go | 14 ++--- + internal/resource/url.go | 10 ++-- internal/resource/url_test.go | 6 +- internal/sgdisk/sgdisk.go | 8 +-- internal/state/state.go | 2 +- @@ -426,33 +472,33 @@ Signed-off-by: Mathieu Tortuyaux tests/positive/systemd/create_unit.go | 4 +- tests/positive/systemd/modify_service.go | 4 +- tests/positive/timeouts/timeouts.go | 4 +- - tests/register/register.go | 16 ++--- + tests/register/register.go | 18 +++--- tests/registry/registry.go | 40 ++++++------- tests/servers/servers.go | 2 +- tests/validator.go | 4 +- validate/main.go | 4 +- - 426 files changed, 1138 insertions(+), 1138 deletions(-) + 472 files changed, 1239 insertions(+), 1239 deletions(-) diff --git a/config/config.go b/config/config.go -index 47e82214..0cbdb15d 100644 +index 66b602c4..f361e865 100644 --- a/config/config.go +++ b/config/config.go @@ -15,8 +15,8 @@ package config import ( -- exp "github.com/coreos/ignition/v2/config/v3_6_experimental" -- types_exp "github.com/coreos/ignition/v2/config/v3_6_experimental/types" -+ exp "github.com/flatcar/ignition/v2/config/v3_6_experimental" -+ types_exp "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" +- exp "github.com/coreos/ignition/v2/config/v3_7_experimental" +- types_exp "github.com/coreos/ignition/v2/config/v3_7_experimental/types" ++ exp "github.com/flatcar/ignition/v2/config/v3_7_experimental" ++ types_exp "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" "github.com/coreos/vcontext/report" ) diff --git a/config/config_test.go b/config/config_test.go -index a38159de..c4c15145 100644 +index 64d970d3..4f6142de 100644 --- a/config/config_test.go +++ b/config/config_test.go -@@ -19,14 +19,14 @@ import ( +@@ -19,15 +19,15 @@ import ( "reflect" "testing" @@ -463,7 +509,8 @@ index a38159de..c4c15145 100644 - v3_3 "github.com/coreos/ignition/v2/config/v3_3/types" - v3_4 "github.com/coreos/ignition/v2/config/v3_4/types" - v3_5 "github.com/coreos/ignition/v2/config/v3_5/types" -- v3_6 "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- v3_6 "github.com/coreos/ignition/v2/config/v3_6/types" +- v3_7 "github.com/coreos/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/config/util" + v3_0 "github.com/flatcar/ignition/v2/config/v3_0/types" + v3_1 "github.com/flatcar/ignition/v2/config/v3_1/types" @@ -471,7 +518,8 @@ index a38159de..c4c15145 100644 + v3_3 "github.com/flatcar/ignition/v2/config/v3_3/types" + v3_4 "github.com/flatcar/ignition/v2/config/v3_4/types" + v3_5 "github.com/flatcar/ignition/v2/config/v3_5/types" -+ v3_6 "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ v3_6 "github.com/flatcar/ignition/v2/config/v3_6/types" ++ v3_7 "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" ) type typeSet map[reflect.Type]struct{} @@ -533,7 +581,7 @@ index 1ba91b3d..f2bcc274 100644 } transcribeOne(fromPath, toPath, transcript) diff --git a/config/merge/merge_test.go b/config/merge/merge_test.go -index ab122171..d59577fb 100644 +index d0c1d7f2..2aab24c4 100644 --- a/config/merge/merge_test.go +++ b/config/merge/merge_test.go @@ -17,9 +17,9 @@ package merge @@ -542,10 +590,10 @@ index ab122171..d59577fb 100644 - "github.com/coreos/ignition/v2/config/util" - v3_2 "github.com/coreos/ignition/v2/config/v3_2/types" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/config/util" + v3_2 "github.com/flatcar/ignition/v2/config/v3_2/types" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" "github.com/coreos/vcontext/path" "github.com/stretchr/testify/assert" @@ -4178,50 +4226,50 @@ index 9a0914d0..f121b503 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/config.go b/config/v3_6_experimental/config.go -index e67b08ba..3be26cae 100644 ---- a/config/v3_6_experimental/config.go -+++ b/config/v3_6_experimental/config.go +diff --git a/config/v3_6/config.go b/config/v3_6/config.go +index 3d4b1d7f..6a56c29a 100644 +--- a/config/v3_6/config.go ++++ b/config/v3_6/config.go @@ -15,13 +15,13 @@ - package v3_6_experimental + package v3_6 import ( - "github.com/coreos/ignition/v2/config/merge" - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" - prev "github.com/coreos/ignition/v2/config/v3_5" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/translate" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_6/translate" +- "github.com/coreos/ignition/v2/config/v3_6/types" - "github.com/coreos/ignition/v2/config/validate" + "github.com/flatcar/ignition/v2/config/merge" + "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/util" + prev "github.com/flatcar/ignition/v2/config/v3_5" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/translate" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_6/translate" ++ "github.com/flatcar/ignition/v2/config/v3_6/types" + "github.com/flatcar/ignition/v2/config/validate" "github.com/coreos/go-semver/semver" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/config_test.go b/config/v3_6_experimental/config_test.go -index 8ba56163..54cbd91c 100644 ---- a/config/v3_6_experimental/config_test.go -+++ b/config/v3_6_experimental/config_test.go -@@ -17,8 +17,8 @@ package v3_6_experimental +diff --git a/config/v3_6/config_test.go b/config/v3_6/config_test.go +index fe61553f..7ba97987 100644 +--- a/config/v3_6/config_test.go ++++ b/config/v3_6/config_test.go +@@ -17,8 +17,8 @@ package v3_6 import ( "testing" - "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_6/types" + "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_6/types" "github.com/stretchr/testify/assert" ) -diff --git a/config/v3_6_experimental/translate/translate.go b/config/v3_6_experimental/translate/translate.go -index 8fa25674..4dfb1827 100644 ---- a/config/v3_6_experimental/translate/translate.go -+++ b/config/v3_6_experimental/translate/translate.go +diff --git a/config/v3_6/translate/translate.go b/config/v3_6/translate/translate.go +index ae16eef3..3974aa50 100644 +--- a/config/v3_6/translate/translate.go ++++ b/config/v3_6/translate/translate.go @@ -15,10 +15,10 @@ package translate @@ -4229,18 +4277,18 @@ index 8fa25674..4dfb1827 100644 - "github.com/coreos/ignition/v2/config/translate" - "github.com/coreos/ignition/v2/config/util" - old_types "github.com/coreos/ignition/v2/config/v3_5/types" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_6/types" + "github.com/flatcar/ignition/v2/config/translate" + "github.com/flatcar/ignition/v2/config/util" + old_types "github.com/flatcar/ignition/v2/config/v3_5/types" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_6/types" ) func translateFileEmbedded1(old old_types.FileEmbedded1) (ret types.FileEmbedded1) { -diff --git a/config/v3_6_experimental/translate/translate_test.go b/config/v3_6_experimental/translate/translate_test.go +diff --git a/config/v3_6/translate/translate_test.go b/config/v3_6/translate/translate_test.go index fc9e3de5..cc041bdc 100644 ---- a/config/v3_6_experimental/translate/translate_test.go -+++ b/config/v3_6_experimental/translate/translate_test.go +--- a/config/v3_6/translate/translate_test.go ++++ b/config/v3_6/translate/translate_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" @@ -4252,10 +4300,10 @@ index fc9e3de5..cc041bdc 100644 ) // Check that we have valid translators for the complete config struct -diff --git a/config/v3_6_experimental/types/cex.go b/config/v3_6_experimental/types/cex.go +diff --git a/config/v3_6/types/cex.go b/config/v3_6/types/cex.go index b34f5f52..6f58b373 100644 ---- a/config/v3_6_experimental/types/cex.go -+++ b/config/v3_6_experimental/types/cex.go +--- a/config/v3_6/types/cex.go ++++ b/config/v3_6/types/cex.go @@ -15,7 +15,7 @@ package types @@ -4265,10 +4313,10 @@ index b34f5f52..6f58b373 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/cex_test.go b/config/v3_6_experimental/types/cex_test.go +diff --git a/config/v3_6/types/cex_test.go b/config/v3_6/types/cex_test.go index 35d562d8..e856a93f 100644 ---- a/config/v3_6_experimental/types/cex_test.go -+++ b/config/v3_6_experimental/types/cex_test.go +--- a/config/v3_6/types/cex_test.go ++++ b/config/v3_6/types/cex_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" @@ -4278,10 +4326,681 @@ index 35d562d8..e856a93f 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/clevis.go b/config/v3_6_experimental/types/clevis.go -index 68887d43..564154f6 100644 ---- a/config/v3_6_experimental/types/clevis.go -+++ b/config/v3_6_experimental/types/clevis.go +diff --git a/config/v3_6/types/clevis.go b/config/v3_6/types/clevis.go +index 3742633d..403603a9 100644 +--- a/config/v3_6/types/clevis.go ++++ b/config/v3_6/types/clevis.go +@@ -15,8 +15,8 @@ + package types + + import ( +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/clevis_test.go b/config/v3_6/types/clevis_test.go +index 81fb3b26..ce35bac9 100644 +--- a/config/v3_6/types/clevis_test.go ++++ b/config/v3_6/types/clevis_test.go +@@ -18,8 +18,8 @@ import ( + "reflect" + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/config.go b/config/v3_6/types/config.go +index 02ef7b4a..97a3b66a 100644 +--- a/config/v3_6/types/config.go ++++ b/config/v3_6/types/config.go +@@ -15,8 +15,8 @@ + package types + + import ( +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/go-semver/semver" + "github.com/coreos/vcontext/path" +diff --git a/config/v3_6/types/config_test.go b/config/v3_6/types/config_test.go +index 3d82627b..511c5ecd 100644 +--- a/config/v3_6/types/config_test.go ++++ b/config/v3_6/types/config_test.go +@@ -18,8 +18,8 @@ import ( + "reflect" + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/disk.go b/config/v3_6/types/disk.go +index 8caf8499..29fd3900 100644 +--- a/config/v3_6/types/disk.go ++++ b/config/v3_6/types/disk.go +@@ -15,8 +15,8 @@ + package types + + import ( +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/file.go b/config/v3_6/types/file.go +index 9b71bb26..e3f7fbdf 100644 +--- a/config/v3_6/types/file.go ++++ b/config/v3_6/types/file.go +@@ -15,8 +15,8 @@ + package types + + import ( +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/file_test.go b/config/v3_6/types/file_test.go +index 449e0700..5aa2e87c 100644 +--- a/config/v3_6/types/file_test.go ++++ b/config/v3_6/types/file_test.go +@@ -17,8 +17,8 @@ package types + import ( + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + ) + + func TestFileValidateOverwrite(t *testing.T) { +diff --git a/config/v3_6/types/filesystem.go b/config/v3_6/types/filesystem.go +index c722b363..9f7f8bbc 100644 +--- a/config/v3_6/types/filesystem.go ++++ b/config/v3_6/types/filesystem.go +@@ -15,8 +15,8 @@ + package types + + import ( +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/filesystem_test.go b/config/v3_6/types/filesystem_test.go +index 1f8db903..6e710426 100644 +--- a/config/v3_6/types/filesystem_test.go ++++ b/config/v3_6/types/filesystem_test.go +@@ -17,8 +17,8 @@ package types + import ( + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + ) + + func TestFilesystemValidateFormat(t *testing.T) { +diff --git a/config/v3_6/types/headers.go b/config/v3_6/types/headers.go +index be1aadad..e968a2b4 100644 +--- a/config/v3_6/types/headers.go ++++ b/config/v3_6/types/headers.go +@@ -17,7 +17,7 @@ package types + import ( + "net/http" + +- "github.com/coreos/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" + ) +diff --git a/config/v3_6/types/headers_test.go b/config/v3_6/types/headers_test.go +index 40380b68..5e888830 100644 +--- a/config/v3_6/types/headers_test.go ++++ b/config/v3_6/types/headers_test.go +@@ -17,7 +17,7 @@ package types + import ( + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" + ) + + func toPointer(val string) *string { +diff --git a/config/v3_6/types/ignition.go b/config/v3_6/types/ignition.go +index 190445bd..1fbcf8c4 100644 +--- a/config/v3_6/types/ignition.go ++++ b/config/v3_6/types/ignition.go +@@ -17,7 +17,7 @@ package types + import ( + "github.com/coreos/go-semver/semver" + +- "github.com/coreos/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/kargs_test.go b/config/v3_6/types/kargs_test.go +index 1a258727..a79c037a 100644 +--- a/config/v3_6/types/kargs_test.go ++++ b/config/v3_6/types/kargs_test.go +@@ -17,7 +17,7 @@ package types + import ( + "testing" + +- "github.com/coreos/ignition/v2/config/validate" ++ "github.com/flatcar/ignition/v2/config/validate" + ) + + func TestKernelArgumentsValidate(t *testing.T) { +diff --git a/config/v3_6/types/luks.go b/config/v3_6/types/luks.go +index e4c1d681..ce9d087f 100644 +--- a/config/v3_6/types/luks.go ++++ b/config/v3_6/types/luks.go +@@ -17,8 +17,8 @@ package types + import ( + "strings" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/mode.go b/config/v3_6/types/mode.go +index 9eb7573d..67c7ebd3 100644 +--- a/config/v3_6/types/mode.go ++++ b/config/v3_6/types/mode.go +@@ -15,7 +15,7 @@ + package types + + import ( +- "github.com/coreos/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" + ) + + func validateMode(m *int) error { +diff --git a/config/v3_6/types/mode_test.go b/config/v3_6/types/mode_test.go +index 8966e25d..5c973dbf 100644 +--- a/config/v3_6/types/mode_test.go ++++ b/config/v3_6/types/mode_test.go +@@ -18,8 +18,8 @@ import ( + "reflect" + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + ) + + func TestModeValidate(t *testing.T) { +diff --git a/config/v3_6/types/node.go b/config/v3_6/types/node.go +index 248276e7..f4e94f9e 100644 +--- a/config/v3_6/types/node.go ++++ b/config/v3_6/types/node.go +@@ -17,8 +17,8 @@ package types + import ( + "path" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + vpath "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/node_test.go b/config/v3_6/types/node_test.go +index 20ba4eb6..9176b4b7 100644 +--- a/config/v3_6/types/node_test.go ++++ b/config/v3_6/types/node_test.go +@@ -18,8 +18,8 @@ import ( + "reflect" + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/partition.go b/config/v3_6/types/partition.go +index 1b2d97ed..6603af3b 100644 +--- a/config/v3_6/types/partition.go ++++ b/config/v3_6/types/partition.go +@@ -19,8 +19,8 @@ import ( + "regexp" + "strings" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/partition_test.go b/config/v3_6/types/partition_test.go +index a1e1623f..9f8e7997 100644 +--- a/config/v3_6/types/partition_test.go ++++ b/config/v3_6/types/partition_test.go +@@ -17,8 +17,8 @@ package types + import ( + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + ) + + func TestValidateLabel(t *testing.T) { +diff --git a/config/v3_6/types/path.go b/config/v3_6/types/path.go +index 131e300c..cb48e341 100644 +--- a/config/v3_6/types/path.go ++++ b/config/v3_6/types/path.go +@@ -17,8 +17,8 @@ package types + import ( + "path" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + ) + + func validatePath(p string) error { +diff --git a/config/v3_6/types/path_test.go b/config/v3_6/types/path_test.go +index 3d199cbd..33b2d0ba 100644 +--- a/config/v3_6/types/path_test.go ++++ b/config/v3_6/types/path_test.go +@@ -18,7 +18,7 @@ import ( + "reflect" + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" + ) + + func TestPathValidate(t *testing.T) { +diff --git a/config/v3_6/types/proxy.go b/config/v3_6/types/proxy.go +index d48d210a..de146a99 100644 +--- a/config/v3_6/types/proxy.go ++++ b/config/v3_6/types/proxy.go +@@ -17,7 +17,7 @@ package types + import ( + "net/url" + +- "github.com/coreos/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/proxy_test.go b/config/v3_6/types/proxy_test.go +index 269f4fb2..3cc5e5cd 100644 +--- a/config/v3_6/types/proxy_test.go ++++ b/config/v3_6/types/proxy_test.go +@@ -18,8 +18,8 @@ import ( + "reflect" + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/raid.go b/config/v3_6/types/raid.go +index 9d69aa36..fa1d3f4d 100644 +--- a/config/v3_6/types/raid.go ++++ b/config/v3_6/types/raid.go +@@ -15,8 +15,8 @@ + package types + + import ( +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/raid_test.go b/config/v3_6/types/raid_test.go +index 7323b26f..313b4572 100644 +--- a/config/v3_6/types/raid_test.go ++++ b/config/v3_6/types/raid_test.go +@@ -18,8 +18,8 @@ import ( + "reflect" + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/resource.go b/config/v3_6/types/resource.go +index 68da6c7b..6ea74d3d 100644 +--- a/config/v3_6/types/resource.go ++++ b/config/v3_6/types/resource.go +@@ -17,8 +17,8 @@ package types + import ( + "net/url" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/storage.go b/config/v3_6/types/storage.go +index 20cb7304..552749e6 100644 +--- a/config/v3_6/types/storage.go ++++ b/config/v3_6/types/storage.go +@@ -18,8 +18,8 @@ import ( + "path" + "strings" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + vpath "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/storage_test.go b/config/v3_6/types/storage_test.go +index 551688a2..6c35ed27 100644 +--- a/config/v3_6/types/storage_test.go ++++ b/config/v3_6/types/storage_test.go +@@ -18,8 +18,8 @@ import ( + "reflect" + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/systemd.go b/config/v3_6/types/systemd.go +index ac521ba7..818959f4 100644 +--- a/config/v3_6/types/systemd.go ++++ b/config/v3_6/types/systemd.go +@@ -17,9 +17,9 @@ package types + import ( + "regexp" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/shared/parse" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/parse" ++ "github.com/flatcar/ignition/v2/config/util" + + vpath "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/systemd_test.go b/config/v3_6/types/systemd_test.go +index 798eb10f..b432e83b 100644 +--- a/config/v3_6/types/systemd_test.go ++++ b/config/v3_6/types/systemd_test.go +@@ -18,8 +18,8 @@ import ( + "fmt" + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" + "github.com/stretchr/testify/assert" +diff --git a/config/v3_6/types/tang.go b/config/v3_6/types/tang.go +index 1839d6cc..26c155e5 100644 +--- a/config/v3_6/types/tang.go ++++ b/config/v3_6/types/tang.go +@@ -18,8 +18,8 @@ import ( + "encoding/json" + "net/url" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/tang_test.go b/config/v3_6/types/tang_test.go +index fb57b1e4..ed65a712 100644 +--- a/config/v3_6/types/tang_test.go ++++ b/config/v3_6/types/tang_test.go +@@ -18,8 +18,8 @@ import ( + "reflect" + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" + ) +diff --git a/config/v3_6/types/unit.go b/config/v3_6/types/unit.go +index c5ee1e8e..5a9c3b22 100644 +--- a/config/v3_6/types/unit.go ++++ b/config/v3_6/types/unit.go +@@ -17,10 +17,10 @@ package types + import ( + "path" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/shared/parse" +- "github.com/coreos/ignition/v2/config/shared/validations" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/parse" ++ "github.com/flatcar/ignition/v2/config/shared/validations" ++ "github.com/flatcar/ignition/v2/config/util" + + cpath "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/unit_test.go b/config/v3_6/types/unit_test.go +index 3dc90540..8c96dfba 100644 +--- a/config/v3_6/types/unit_test.go ++++ b/config/v3_6/types/unit_test.go +@@ -19,8 +19,8 @@ import ( + "reflect" + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/url.go b/config/v3_6/types/url.go +index 97a4c9ae..b1f96337 100644 +--- a/config/v3_6/types/url.go ++++ b/config/v3_6/types/url.go +@@ -21,8 +21,8 @@ import ( + "github.com/aws/aws-sdk-go-v2/aws/arn" + "github.com/vincent-petithory/dataurl" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + ) + + func validateURL(s string) error { +diff --git a/config/v3_6/types/url_test.go b/config/v3_6/types/url_test.go +index 1901b7af..12a4cfbf 100644 +--- a/config/v3_6/types/url_test.go ++++ b/config/v3_6/types/url_test.go +@@ -17,8 +17,8 @@ package types + import ( + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + ) + + func TestURLValidate(t *testing.T) { +diff --git a/config/v3_6/types/verification.go b/config/v3_6/types/verification.go +index 5def6f04..1ef291c0 100644 +--- a/config/v3_6/types/verification.go ++++ b/config/v3_6/types/verification.go +@@ -19,7 +19,7 @@ import ( + "encoding/hex" + "strings" + +- "github.com/coreos/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_6/types/verification_test.go b/config/v3_6/types/verification_test.go +index 9a0914d0..f121b503 100644 +--- a/config/v3_6/types/verification_test.go ++++ b/config/v3_6/types/verification_test.go +@@ -18,7 +18,7 @@ import ( + "reflect" + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_7_experimental/config.go b/config/v3_7_experimental/config.go +index c82ca703..8d02129e 100644 +--- a/config/v3_7_experimental/config.go ++++ b/config/v3_7_experimental/config.go +@@ -15,13 +15,13 @@ + package v3_7_experimental + + import ( +- "github.com/coreos/ignition/v2/config/merge" +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" +- prev "github.com/coreos/ignition/v2/config/v3_6" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/translate" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" +- "github.com/coreos/ignition/v2/config/validate" ++ "github.com/flatcar/ignition/v2/config/merge" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ++ prev "github.com/flatcar/ignition/v2/config/v3_6" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/translate" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" ++ "github.com/flatcar/ignition/v2/config/validate" + + "github.com/coreos/go-semver/semver" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_7_experimental/config_test.go b/config/v3_7_experimental/config_test.go +index d9dff3f5..beb5c6d6 100644 +--- a/config/v3_7_experimental/config_test.go ++++ b/config/v3_7_experimental/config_test.go +@@ -17,8 +17,8 @@ package v3_7_experimental + import ( + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/stretchr/testify/assert" + ) + +diff --git a/config/v3_7_experimental/translate/translate.go b/config/v3_7_experimental/translate/translate.go +index 3946b1fe..95d6cdcd 100644 +--- a/config/v3_7_experimental/translate/translate.go ++++ b/config/v3_7_experimental/translate/translate.go +@@ -15,9 +15,9 @@ + package translate + + import ( +- "github.com/coreos/ignition/v2/config/translate" +- old_types "github.com/coreos/ignition/v2/config/v3_6/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" ++ "github.com/flatcar/ignition/v2/config/translate" ++ old_types "github.com/flatcar/ignition/v2/config/v3_6/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + ) + + func translateIgnition(old old_types.Ignition) (ret types.Ignition) { +diff --git a/config/v3_7_experimental/translate/translate_test.go b/config/v3_7_experimental/translate/translate_test.go +index 043e4cbf..2e277309 100644 +--- a/config/v3_7_experimental/translate/translate_test.go ++++ b/config/v3_7_experimental/translate/translate_test.go +@@ -18,8 +18,8 @@ import ( + "reflect" + "testing" + +- "github.com/coreos/ignition/v2/config/util" +- old "github.com/coreos/ignition/v2/config/v3_6/types" ++ "github.com/flatcar/ignition/v2/config/util" ++ old "github.com/flatcar/ignition/v2/config/v3_6/types" + ) + + // Check that we have valid translators for the complete config struct +diff --git a/config/v3_7_experimental/types/cex.go b/config/v3_7_experimental/types/cex.go +index b34f5f52..6f58b373 100644 +--- a/config/v3_7_experimental/types/cex.go ++++ b/config/v3_7_experimental/types/cex.go +@@ -15,7 +15,7 @@ + package types + + import ( +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_7_experimental/types/cex_test.go b/config/v3_7_experimental/types/cex_test.go +index 35d562d8..e856a93f 100644 +--- a/config/v3_7_experimental/types/cex_test.go ++++ b/config/v3_7_experimental/types/cex_test.go +@@ -18,7 +18,7 @@ import ( + "reflect" + "testing" + +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_7_experimental/types/clevis.go b/config/v3_7_experimental/types/clevis.go +index 3742633d..403603a9 100644 +--- a/config/v3_7_experimental/types/clevis.go ++++ b/config/v3_7_experimental/types/clevis.go @@ -15,8 +15,8 @@ package types @@ -4293,10 +5012,10 @@ index 68887d43..564154f6 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/clevis_test.go b/config/v3_6_experimental/types/clevis_test.go -index f616868c..c28509ee 100644 ---- a/config/v3_6_experimental/types/clevis_test.go -+++ b/config/v3_6_experimental/types/clevis_test.go +diff --git a/config/v3_7_experimental/types/clevis_test.go b/config/v3_7_experimental/types/clevis_test.go +index 81fb3b26..ce35bac9 100644 +--- a/config/v3_7_experimental/types/clevis_test.go ++++ b/config/v3_7_experimental/types/clevis_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" @@ -4308,10 +5027,10 @@ index f616868c..c28509ee 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/config.go b/config/v3_6_experimental/types/config.go -index 9428b0bb..4d042f54 100644 ---- a/config/v3_6_experimental/types/config.go -+++ b/config/v3_6_experimental/types/config.go +diff --git a/config/v3_7_experimental/types/config.go b/config/v3_7_experimental/types/config.go +index a3baabf0..d319bde6 100644 +--- a/config/v3_7_experimental/types/config.go ++++ b/config/v3_7_experimental/types/config.go @@ -15,8 +15,8 @@ package types @@ -4323,10 +5042,10 @@ index 9428b0bb..4d042f54 100644 "github.com/coreos/go-semver/semver" "github.com/coreos/vcontext/path" -diff --git a/config/v3_6_experimental/types/config_test.go b/config/v3_6_experimental/types/config_test.go +diff --git a/config/v3_7_experimental/types/config_test.go b/config/v3_7_experimental/types/config_test.go index 3d82627b..511c5ecd 100644 ---- a/config/v3_6_experimental/types/config_test.go -+++ b/config/v3_6_experimental/types/config_test.go +--- a/config/v3_7_experimental/types/config_test.go ++++ b/config/v3_7_experimental/types/config_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" @@ -4338,10 +5057,10 @@ index 3d82627b..511c5ecd 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/disk.go b/config/v3_6_experimental/types/disk.go +diff --git a/config/v3_7_experimental/types/disk.go b/config/v3_7_experimental/types/disk.go index 8caf8499..29fd3900 100644 ---- a/config/v3_6_experimental/types/disk.go -+++ b/config/v3_6_experimental/types/disk.go +--- a/config/v3_7_experimental/types/disk.go ++++ b/config/v3_7_experimental/types/disk.go @@ -15,8 +15,8 @@ package types @@ -4353,10 +5072,10 @@ index 8caf8499..29fd3900 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/file.go b/config/v3_6_experimental/types/file.go +diff --git a/config/v3_7_experimental/types/file.go b/config/v3_7_experimental/types/file.go index 9b71bb26..e3f7fbdf 100644 ---- a/config/v3_6_experimental/types/file.go -+++ b/config/v3_6_experimental/types/file.go +--- a/config/v3_7_experimental/types/file.go ++++ b/config/v3_7_experimental/types/file.go @@ -15,8 +15,8 @@ package types @@ -4368,10 +5087,10 @@ index 9b71bb26..e3f7fbdf 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/file_test.go b/config/v3_6_experimental/types/file_test.go +diff --git a/config/v3_7_experimental/types/file_test.go b/config/v3_7_experimental/types/file_test.go index 449e0700..5aa2e87c 100644 ---- a/config/v3_6_experimental/types/file_test.go -+++ b/config/v3_6_experimental/types/file_test.go +--- a/config/v3_7_experimental/types/file_test.go ++++ b/config/v3_7_experimental/types/file_test.go @@ -17,8 +17,8 @@ package types import ( "testing" @@ -4383,10 +5102,10 @@ index 449e0700..5aa2e87c 100644 ) func TestFileValidateOverwrite(t *testing.T) { -diff --git a/config/v3_6_experimental/types/filesystem.go b/config/v3_6_experimental/types/filesystem.go +diff --git a/config/v3_7_experimental/types/filesystem.go b/config/v3_7_experimental/types/filesystem.go index c722b363..9f7f8bbc 100644 ---- a/config/v3_6_experimental/types/filesystem.go -+++ b/config/v3_6_experimental/types/filesystem.go +--- a/config/v3_7_experimental/types/filesystem.go ++++ b/config/v3_7_experimental/types/filesystem.go @@ -15,8 +15,8 @@ package types @@ -4398,10 +5117,10 @@ index c722b363..9f7f8bbc 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/filesystem_test.go b/config/v3_6_experimental/types/filesystem_test.go +diff --git a/config/v3_7_experimental/types/filesystem_test.go b/config/v3_7_experimental/types/filesystem_test.go index 1f8db903..6e710426 100644 ---- a/config/v3_6_experimental/types/filesystem_test.go -+++ b/config/v3_6_experimental/types/filesystem_test.go +--- a/config/v3_7_experimental/types/filesystem_test.go ++++ b/config/v3_7_experimental/types/filesystem_test.go @@ -17,8 +17,8 @@ package types import ( "testing" @@ -4413,10 +5132,10 @@ index 1f8db903..6e710426 100644 ) func TestFilesystemValidateFormat(t *testing.T) { -diff --git a/config/v3_6_experimental/types/headers.go b/config/v3_6_experimental/types/headers.go +diff --git a/config/v3_7_experimental/types/headers.go b/config/v3_7_experimental/types/headers.go index be1aadad..e968a2b4 100644 ---- a/config/v3_6_experimental/types/headers.go -+++ b/config/v3_6_experimental/types/headers.go +--- a/config/v3_7_experimental/types/headers.go ++++ b/config/v3_7_experimental/types/headers.go @@ -17,7 +17,7 @@ package types import ( "net/http" @@ -4426,10 +5145,10 @@ index be1aadad..e968a2b4 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" ) -diff --git a/config/v3_6_experimental/types/headers_test.go b/config/v3_6_experimental/types/headers_test.go +diff --git a/config/v3_7_experimental/types/headers_test.go b/config/v3_7_experimental/types/headers_test.go index 40380b68..5e888830 100644 ---- a/config/v3_6_experimental/types/headers_test.go -+++ b/config/v3_6_experimental/types/headers_test.go +--- a/config/v3_7_experimental/types/headers_test.go ++++ b/config/v3_7_experimental/types/headers_test.go @@ -17,7 +17,7 @@ package types import ( "testing" @@ -4439,10 +5158,10 @@ index 40380b68..5e888830 100644 ) func toPointer(val string) *string { -diff --git a/config/v3_6_experimental/types/ignition.go b/config/v3_6_experimental/types/ignition.go +diff --git a/config/v3_7_experimental/types/ignition.go b/config/v3_7_experimental/types/ignition.go index 190445bd..1fbcf8c4 100644 ---- a/config/v3_6_experimental/types/ignition.go -+++ b/config/v3_6_experimental/types/ignition.go +--- a/config/v3_7_experimental/types/ignition.go ++++ b/config/v3_7_experimental/types/ignition.go @@ -17,7 +17,7 @@ package types import ( "github.com/coreos/go-semver/semver" @@ -4452,10 +5171,10 @@ index 190445bd..1fbcf8c4 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/kargs_test.go b/config/v3_6_experimental/types/kargs_test.go +diff --git a/config/v3_7_experimental/types/kargs_test.go b/config/v3_7_experimental/types/kargs_test.go index 1a258727..a79c037a 100644 ---- a/config/v3_6_experimental/types/kargs_test.go -+++ b/config/v3_6_experimental/types/kargs_test.go +--- a/config/v3_7_experimental/types/kargs_test.go ++++ b/config/v3_7_experimental/types/kargs_test.go @@ -17,7 +17,7 @@ package types import ( "testing" @@ -4465,10 +5184,10 @@ index 1a258727..a79c037a 100644 ) func TestKernelArgumentsValidate(t *testing.T) { -diff --git a/config/v3_6_experimental/types/luks.go b/config/v3_6_experimental/types/luks.go +diff --git a/config/v3_7_experimental/types/luks.go b/config/v3_7_experimental/types/luks.go index e4c1d681..ce9d087f 100644 ---- a/config/v3_6_experimental/types/luks.go -+++ b/config/v3_6_experimental/types/luks.go +--- a/config/v3_7_experimental/types/luks.go ++++ b/config/v3_7_experimental/types/luks.go @@ -17,8 +17,8 @@ package types import ( "strings" @@ -4480,10 +5199,10 @@ index e4c1d681..ce9d087f 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/mode.go b/config/v3_6_experimental/types/mode.go +diff --git a/config/v3_7_experimental/types/mode.go b/config/v3_7_experimental/types/mode.go index 9eb7573d..67c7ebd3 100644 ---- a/config/v3_6_experimental/types/mode.go -+++ b/config/v3_6_experimental/types/mode.go +--- a/config/v3_7_experimental/types/mode.go ++++ b/config/v3_7_experimental/types/mode.go @@ -15,7 +15,7 @@ package types @@ -4493,10 +5212,10 @@ index 9eb7573d..67c7ebd3 100644 ) func validateMode(m *int) error { -diff --git a/config/v3_6_experimental/types/mode_test.go b/config/v3_6_experimental/types/mode_test.go +diff --git a/config/v3_7_experimental/types/mode_test.go b/config/v3_7_experimental/types/mode_test.go index 8966e25d..5c973dbf 100644 ---- a/config/v3_6_experimental/types/mode_test.go -+++ b/config/v3_6_experimental/types/mode_test.go +--- a/config/v3_7_experimental/types/mode_test.go ++++ b/config/v3_7_experimental/types/mode_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" @@ -4508,10 +5227,10 @@ index 8966e25d..5c973dbf 100644 ) func TestModeValidate(t *testing.T) { -diff --git a/config/v3_6_experimental/types/node.go b/config/v3_6_experimental/types/node.go +diff --git a/config/v3_7_experimental/types/node.go b/config/v3_7_experimental/types/node.go index 248276e7..f4e94f9e 100644 ---- a/config/v3_6_experimental/types/node.go -+++ b/config/v3_6_experimental/types/node.go +--- a/config/v3_7_experimental/types/node.go ++++ b/config/v3_7_experimental/types/node.go @@ -17,8 +17,8 @@ package types import ( "path" @@ -4523,10 +5242,10 @@ index 248276e7..f4e94f9e 100644 vpath "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/node_test.go b/config/v3_6_experimental/types/node_test.go +diff --git a/config/v3_7_experimental/types/node_test.go b/config/v3_7_experimental/types/node_test.go index 20ba4eb6..9176b4b7 100644 ---- a/config/v3_6_experimental/types/node_test.go -+++ b/config/v3_6_experimental/types/node_test.go +--- a/config/v3_7_experimental/types/node_test.go ++++ b/config/v3_7_experimental/types/node_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" @@ -4538,10 +5257,10 @@ index 20ba4eb6..9176b4b7 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/partition.go b/config/v3_6_experimental/types/partition.go +diff --git a/config/v3_7_experimental/types/partition.go b/config/v3_7_experimental/types/partition.go index 1b2d97ed..6603af3b 100644 ---- a/config/v3_6_experimental/types/partition.go -+++ b/config/v3_6_experimental/types/partition.go +--- a/config/v3_7_experimental/types/partition.go ++++ b/config/v3_7_experimental/types/partition.go @@ -19,8 +19,8 @@ import ( "regexp" "strings" @@ -4553,10 +5272,10 @@ index 1b2d97ed..6603af3b 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/partition_test.go b/config/v3_6_experimental/types/partition_test.go +diff --git a/config/v3_7_experimental/types/partition_test.go b/config/v3_7_experimental/types/partition_test.go index a1e1623f..9f8e7997 100644 ---- a/config/v3_6_experimental/types/partition_test.go -+++ b/config/v3_6_experimental/types/partition_test.go +--- a/config/v3_7_experimental/types/partition_test.go ++++ b/config/v3_7_experimental/types/partition_test.go @@ -17,8 +17,8 @@ package types import ( "testing" @@ -4568,10 +5287,10 @@ index a1e1623f..9f8e7997 100644 ) func TestValidateLabel(t *testing.T) { -diff --git a/config/v3_6_experimental/types/path.go b/config/v3_6_experimental/types/path.go +diff --git a/config/v3_7_experimental/types/path.go b/config/v3_7_experimental/types/path.go index 131e300c..cb48e341 100644 ---- a/config/v3_6_experimental/types/path.go -+++ b/config/v3_6_experimental/types/path.go +--- a/config/v3_7_experimental/types/path.go ++++ b/config/v3_7_experimental/types/path.go @@ -17,8 +17,8 @@ package types import ( "path" @@ -4583,10 +5302,10 @@ index 131e300c..cb48e341 100644 ) func validatePath(p string) error { -diff --git a/config/v3_6_experimental/types/path_test.go b/config/v3_6_experimental/types/path_test.go +diff --git a/config/v3_7_experimental/types/path_test.go b/config/v3_7_experimental/types/path_test.go index 3d199cbd..33b2d0ba 100644 ---- a/config/v3_6_experimental/types/path_test.go -+++ b/config/v3_6_experimental/types/path_test.go +--- a/config/v3_7_experimental/types/path_test.go ++++ b/config/v3_7_experimental/types/path_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" @@ -4596,10 +5315,10 @@ index 3d199cbd..33b2d0ba 100644 ) func TestPathValidate(t *testing.T) { -diff --git a/config/v3_6_experimental/types/proxy.go b/config/v3_6_experimental/types/proxy.go +diff --git a/config/v3_7_experimental/types/proxy.go b/config/v3_7_experimental/types/proxy.go index d48d210a..de146a99 100644 ---- a/config/v3_6_experimental/types/proxy.go -+++ b/config/v3_6_experimental/types/proxy.go +--- a/config/v3_7_experimental/types/proxy.go ++++ b/config/v3_7_experimental/types/proxy.go @@ -17,7 +17,7 @@ package types import ( "net/url" @@ -4609,10 +5328,10 @@ index d48d210a..de146a99 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/proxy_test.go b/config/v3_6_experimental/types/proxy_test.go +diff --git a/config/v3_7_experimental/types/proxy_test.go b/config/v3_7_experimental/types/proxy_test.go index 269f4fb2..3cc5e5cd 100644 ---- a/config/v3_6_experimental/types/proxy_test.go -+++ b/config/v3_6_experimental/types/proxy_test.go +--- a/config/v3_7_experimental/types/proxy_test.go ++++ b/config/v3_7_experimental/types/proxy_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" @@ -4624,10 +5343,10 @@ index 269f4fb2..3cc5e5cd 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/raid.go b/config/v3_6_experimental/types/raid.go +diff --git a/config/v3_7_experimental/types/raid.go b/config/v3_7_experimental/types/raid.go index 9d69aa36..fa1d3f4d 100644 ---- a/config/v3_6_experimental/types/raid.go -+++ b/config/v3_6_experimental/types/raid.go +--- a/config/v3_7_experimental/types/raid.go ++++ b/config/v3_7_experimental/types/raid.go @@ -15,8 +15,8 @@ package types @@ -4639,10 +5358,10 @@ index 9d69aa36..fa1d3f4d 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/raid_test.go b/config/v3_6_experimental/types/raid_test.go +diff --git a/config/v3_7_experimental/types/raid_test.go b/config/v3_7_experimental/types/raid_test.go index 7323b26f..313b4572 100644 ---- a/config/v3_6_experimental/types/raid_test.go -+++ b/config/v3_6_experimental/types/raid_test.go +--- a/config/v3_7_experimental/types/raid_test.go ++++ b/config/v3_7_experimental/types/raid_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" @@ -4654,10 +5373,10 @@ index 7323b26f..313b4572 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/resource.go b/config/v3_6_experimental/types/resource.go +diff --git a/config/v3_7_experimental/types/resource.go b/config/v3_7_experimental/types/resource.go index 68da6c7b..6ea74d3d 100644 ---- a/config/v3_6_experimental/types/resource.go -+++ b/config/v3_6_experimental/types/resource.go +--- a/config/v3_7_experimental/types/resource.go ++++ b/config/v3_7_experimental/types/resource.go @@ -17,8 +17,8 @@ package types import ( "net/url" @@ -4669,10 +5388,10 @@ index 68da6c7b..6ea74d3d 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/storage.go b/config/v3_6_experimental/types/storage.go +diff --git a/config/v3_7_experimental/types/storage.go b/config/v3_7_experimental/types/storage.go index 20cb7304..552749e6 100644 ---- a/config/v3_6_experimental/types/storage.go -+++ b/config/v3_6_experimental/types/storage.go +--- a/config/v3_7_experimental/types/storage.go ++++ b/config/v3_7_experimental/types/storage.go @@ -18,8 +18,8 @@ import ( "path" "strings" @@ -4684,10 +5403,10 @@ index 20cb7304..552749e6 100644 vpath "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/storage_test.go b/config/v3_6_experimental/types/storage_test.go +diff --git a/config/v3_7_experimental/types/storage_test.go b/config/v3_7_experimental/types/storage_test.go index 551688a2..6c35ed27 100644 ---- a/config/v3_6_experimental/types/storage_test.go -+++ b/config/v3_6_experimental/types/storage_test.go +--- a/config/v3_7_experimental/types/storage_test.go ++++ b/config/v3_7_experimental/types/storage_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" @@ -4699,10 +5418,10 @@ index 551688a2..6c35ed27 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/systemd.go b/config/v3_6_experimental/types/systemd.go +diff --git a/config/v3_7_experimental/types/systemd.go b/config/v3_7_experimental/types/systemd.go index ac521ba7..818959f4 100644 ---- a/config/v3_6_experimental/types/systemd.go -+++ b/config/v3_6_experimental/types/systemd.go +--- a/config/v3_7_experimental/types/systemd.go ++++ b/config/v3_7_experimental/types/systemd.go @@ -17,9 +17,9 @@ package types import ( "regexp" @@ -4716,10 +5435,10 @@ index ac521ba7..818959f4 100644 vpath "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/systemd_test.go b/config/v3_6_experimental/types/systemd_test.go +diff --git a/config/v3_7_experimental/types/systemd_test.go b/config/v3_7_experimental/types/systemd_test.go index 798eb10f..b432e83b 100644 ---- a/config/v3_6_experimental/types/systemd_test.go -+++ b/config/v3_6_experimental/types/systemd_test.go +--- a/config/v3_7_experimental/types/systemd_test.go ++++ b/config/v3_7_experimental/types/systemd_test.go @@ -18,8 +18,8 @@ import ( "fmt" "testing" @@ -4731,10 +5450,10 @@ index 798eb10f..b432e83b 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" "github.com/stretchr/testify/assert" -diff --git a/config/v3_6_experimental/types/tang.go b/config/v3_6_experimental/types/tang.go +diff --git a/config/v3_7_experimental/types/tang.go b/config/v3_7_experimental/types/tang.go index 1839d6cc..26c155e5 100644 ---- a/config/v3_6_experimental/types/tang.go -+++ b/config/v3_6_experimental/types/tang.go +--- a/config/v3_7_experimental/types/tang.go ++++ b/config/v3_7_experimental/types/tang.go @@ -18,8 +18,8 @@ import ( "encoding/json" "net/url" @@ -4746,10 +5465,10 @@ index 1839d6cc..26c155e5 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/tang_test.go b/config/v3_6_experimental/types/tang_test.go +diff --git a/config/v3_7_experimental/types/tang_test.go b/config/v3_7_experimental/types/tang_test.go index fb57b1e4..ed65a712 100644 ---- a/config/v3_6_experimental/types/tang_test.go -+++ b/config/v3_6_experimental/types/tang_test.go +--- a/config/v3_7_experimental/types/tang_test.go ++++ b/config/v3_7_experimental/types/tang_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" @@ -4761,10 +5480,10 @@ index fb57b1e4..ed65a712 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" ) -diff --git a/config/v3_6_experimental/types/unit.go b/config/v3_6_experimental/types/unit.go +diff --git a/config/v3_7_experimental/types/unit.go b/config/v3_7_experimental/types/unit.go index c5ee1e8e..5a9c3b22 100644 ---- a/config/v3_6_experimental/types/unit.go -+++ b/config/v3_6_experimental/types/unit.go +--- a/config/v3_7_experimental/types/unit.go ++++ b/config/v3_7_experimental/types/unit.go @@ -17,10 +17,10 @@ package types import ( "path" @@ -4780,10 +5499,10 @@ index c5ee1e8e..5a9c3b22 100644 cpath "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/unit_test.go b/config/v3_6_experimental/types/unit_test.go +diff --git a/config/v3_7_experimental/types/unit_test.go b/config/v3_7_experimental/types/unit_test.go index 3dc90540..8c96dfba 100644 ---- a/config/v3_6_experimental/types/unit_test.go -+++ b/config/v3_6_experimental/types/unit_test.go +--- a/config/v3_7_experimental/types/unit_test.go ++++ b/config/v3_7_experimental/types/unit_test.go @@ -19,8 +19,8 @@ import ( "reflect" "testing" @@ -4795,10 +5514,10 @@ index 3dc90540..8c96dfba 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/url.go b/config/v3_6_experimental/types/url.go +diff --git a/config/v3_7_experimental/types/url.go b/config/v3_7_experimental/types/url.go index 97a4c9ae..b1f96337 100644 ---- a/config/v3_6_experimental/types/url.go -+++ b/config/v3_6_experimental/types/url.go +--- a/config/v3_7_experimental/types/url.go ++++ b/config/v3_7_experimental/types/url.go @@ -21,8 +21,8 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/vincent-petithory/dataurl" @@ -4810,10 +5529,10 @@ index 97a4c9ae..b1f96337 100644 ) func validateURL(s string) error { -diff --git a/config/v3_6_experimental/types/url_test.go b/config/v3_6_experimental/types/url_test.go +diff --git a/config/v3_7_experimental/types/url_test.go b/config/v3_7_experimental/types/url_test.go index 1901b7af..12a4cfbf 100644 ---- a/config/v3_6_experimental/types/url_test.go -+++ b/config/v3_6_experimental/types/url_test.go +--- a/config/v3_7_experimental/types/url_test.go ++++ b/config/v3_7_experimental/types/url_test.go @@ -17,8 +17,8 @@ package types import ( "testing" @@ -4825,10 +5544,10 @@ index 1901b7af..12a4cfbf 100644 ) func TestURLValidate(t *testing.T) { -diff --git a/config/v3_6_experimental/types/verification.go b/config/v3_6_experimental/types/verification.go +diff --git a/config/v3_7_experimental/types/verification.go b/config/v3_7_experimental/types/verification.go index 5def6f04..1ef291c0 100644 ---- a/config/v3_6_experimental/types/verification.go -+++ b/config/v3_6_experimental/types/verification.go +--- a/config/v3_7_experimental/types/verification.go ++++ b/config/v3_7_experimental/types/verification.go @@ -19,7 +19,7 @@ import ( "encoding/hex" "strings" @@ -4838,10 +5557,10 @@ index 5def6f04..1ef291c0 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/verification_test.go b/config/v3_6_experimental/types/verification_test.go +diff --git a/config/v3_7_experimental/types/verification_test.go b/config/v3_7_experimental/types/verification_test.go index 9a0914d0..f121b503 100644 ---- a/config/v3_6_experimental/types/verification_test.go -+++ b/config/v3_6_experimental/types/verification_test.go +--- a/config/v3_7_experimental/types/verification_test.go ++++ b/config/v3_7_experimental/types/verification_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" @@ -4880,7 +5599,7 @@ index 820a7f07..0f359f5b 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/go.mod b/go.mod -index 15869b4e..ab37e13c 100644 +index 2822e5ad..0c090c5b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ @@ -4890,7 +5609,7 @@ index 15869b4e..ab37e13c 100644 go 1.24.0 diff --git a/internal/apply/apply.go b/internal/apply/apply.go -index db48b8dc..b98fdf5d 100644 +index 1e55b937..be4f8f32 100644 --- a/internal/apply/apply.go +++ b/internal/apply/apply.go @@ -20,21 +20,21 @@ import ( @@ -4911,7 +5630,7 @@ index db48b8dc..b98fdf5d 100644 - "github.com/coreos/ignition/v2/internal/state" - "github.com/coreos/ignition/v2/internal/util" - -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/exec" + "github.com/flatcar/ignition/v2/internal/exec/stages" + _ "github.com/flatcar/ignition/v2/internal/exec/stages/disks" @@ -4926,12 +5645,12 @@ index db48b8dc..b98fdf5d 100644 + "github.com/flatcar/ignition/v2/internal/state" + "github.com/flatcar/ignition/v2/internal/util" + -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" ) type Flags struct { diff --git a/internal/distro/distro.go b/internal/distro/distro.go -index cd90d189..9d9351e7 100644 +index 20190903..235882d5 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go @@ -20,7 +20,7 @@ import ( @@ -4944,10 +5663,10 @@ index cd90d189..9d9351e7 100644 // Device node directories and paths diskByLabelDir = "/dev/disk/by-label" diff --git a/internal/doc/main.go b/internal/doc/main.go -index 6cee7a70..518d4bee 100644 +index 11ad19e3..cc097f8c 100644 --- a/internal/doc/main.go +++ b/internal/doc/main.go -@@ -25,14 +25,14 @@ import ( +@@ -25,15 +25,15 @@ import ( "github.com/coreos/go-semver/semver" @@ -4958,7 +5677,8 @@ index 6cee7a70..518d4bee 100644 - v33 "github.com/coreos/ignition/v2/config/v3_3/types" - v34 "github.com/coreos/ignition/v2/config/v3_4/types" - v35 "github.com/coreos/ignition/v2/config/v3_5/types" -- v36 "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- v36 "github.com/coreos/ignition/v2/config/v3_6/types" +- v37 "github.com/coreos/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/config/doc" + v30 "github.com/flatcar/ignition/v2/config/v3_0/types" + v31 "github.com/flatcar/ignition/v2/config/v3_1/types" @@ -4966,12 +5686,13 @@ index 6cee7a70..518d4bee 100644 + v33 "github.com/flatcar/ignition/v2/config/v3_3/types" + v34 "github.com/flatcar/ignition/v2/config/v3_4/types" + v35 "github.com/flatcar/ignition/v2/config/v3_5/types" -+ v36 "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ v36 "github.com/flatcar/ignition/v2/config/v3_6/types" ++ v37 "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" ) var ( diff --git a/internal/exec/config_fetcher.go b/internal/exec/config_fetcher.go -index 0769d983..3067037f 100644 +index db25ad05..cc746a62 100644 --- a/internal/exec/config_fetcher.go +++ b/internal/exec/config_fetcher.go @@ -20,15 +20,15 @@ import ( @@ -4985,8 +5706,8 @@ index 0769d983..3067037f 100644 - "github.com/coreos/ignition/v2/internal/state" - "github.com/coreos/ignition/v2/internal/util" - -- latest "github.com/coreos/ignition/v2/config/v3_6_experimental" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- latest "github.com/coreos/ignition/v2/config/v3_7_experimental" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/config" + "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/internal/log" @@ -4994,13 +5715,13 @@ index 0769d983..3067037f 100644 + "github.com/flatcar/ignition/v2/internal/state" + "github.com/flatcar/ignition/v2/internal/util" + -+ latest "github.com/flatcar/ignition/v2/config/v3_6_experimental" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ latest "github.com/flatcar/ignition/v2/config/v3_7_experimental" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" ) type ConfigFetcher struct { diff --git a/internal/exec/engine.go b/internal/exec/engine.go -index c2e61f7e..2570fc88 100644 +index 7e458f4f..24861db5 100644 --- a/internal/exec/engine.go +++ b/internal/exec/engine.go @@ -23,17 +23,17 @@ import ( @@ -5008,8 +5729,8 @@ index c2e61f7e..2570fc88 100644 "github.com/coreos/go-systemd/v22/journal" - "github.com/coreos/ignition/v2/config/shared/errors" -- latest "github.com/coreos/ignition/v2/config/v3_6_experimental" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- latest "github.com/coreos/ignition/v2/config/v3_7_experimental" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/exec/stages" - executil "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/internal/log" @@ -5019,8 +5740,8 @@ index c2e61f7e..2570fc88 100644 - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" + "github.com/flatcar/ignition/v2/config/shared/errors" -+ latest "github.com/flatcar/ignition/v2/config/v3_6_experimental" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ latest "github.com/flatcar/ignition/v2/config/v3_7_experimental" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/exec/stages" + executil "github.com/flatcar/ignition/v2/internal/exec/util" + "github.com/flatcar/ignition/v2/internal/log" @@ -5033,14 +5754,14 @@ index c2e61f7e..2570fc88 100644 "github.com/coreos/vcontext/report" "github.com/coreos/vcontext/validate" diff --git a/internal/exec/stages/disks/disks.go b/internal/exec/stages/disks/disks.go -index 2d06aaf3..eae124dd 100644 +index 858c17b5..27fdf480 100644 --- a/internal/exec/stages/disks/disks.go +++ b/internal/exec/stages/disks/disks.go @@ -25,14 +25,14 @@ import ( "os/exec" "path/filepath" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/exec/stages" - "github.com/coreos/ignition/v2/internal/exec/util" @@ -5048,7 +5769,7 @@ index 2d06aaf3..eae124dd 100644 - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" - "github.com/coreos/ignition/v2/internal/systemd" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/exec/stages" + "github.com/flatcar/ignition/v2/internal/exec/util" @@ -5060,7 +5781,7 @@ index 2d06aaf3..eae124dd 100644 const ( diff --git a/internal/exec/stages/disks/filesystems.go b/internal/exec/stages/disks/filesystems.go -index a915ca57..a12c59d7 100644 +index cfee68d6..28a931d6 100644 --- a/internal/exec/stages/disks/filesystems.go +++ b/internal/exec/stages/disks/filesystems.go @@ -25,10 +25,10 @@ import ( @@ -5068,18 +5789,18 @@ index a915ca57..a12c59d7 100644 "strings" - cutil "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/exec/util" + cutil "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/exec/util" ) var ( diff --git a/internal/exec/stages/disks/luks.go b/internal/exec/stages/disks/luks.go -index 9dfe9ea3..bffa67ba 100644 +index 72fde098..9114e25a 100644 --- a/internal/exec/stages/disks/luks.go +++ b/internal/exec/stages/disks/luks.go @@ -29,12 +29,12 @@ import ( @@ -5087,13 +5808,13 @@ index 9dfe9ea3..bffa67ba 100644 "strings" - "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - execUtil "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + execUtil "github.com/flatcar/ignition/v2/internal/exec/util" + "github.com/flatcar/ignition/v2/internal/log" @@ -5102,7 +5823,7 @@ index 9dfe9ea3..bffa67ba 100644 "github.com/vincent-petithory/dataurl" ) diff --git a/internal/exec/stages/disks/partitions.go b/internal/exec/stages/disks/partitions.go -index 6285fd5c..dd6acdac 100644 +index 9a7ae9ca..c20e4875 100644 --- a/internal/exec/stages/disks/partitions.go +++ b/internal/exec/stages/disks/partitions.go @@ -30,12 +30,12 @@ import ( @@ -5110,13 +5831,13 @@ index 6285fd5c..dd6acdac 100644 "strings" - cutil "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/internal/sgdisk" - iutil "github.com/coreos/ignition/v2/internal/util" + cutil "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/exec/util" + "github.com/flatcar/ignition/v2/internal/sgdisk" @@ -5125,37 +5846,37 @@ index 6285fd5c..dd6acdac 100644 var ( diff --git a/internal/exec/stages/disks/raid.go b/internal/exec/stages/disks/raid.go -index d46efd82..d2abe537 100644 +index f209efaa..d75dceaa 100644 --- a/internal/exec/stages/disks/raid.go +++ b/internal/exec/stages/disks/raid.go @@ -24,9 +24,9 @@ import ( "os/exec" "strings" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/exec/util" ) func (s stage) createRaids(config types.Config) error { diff --git a/internal/exec/stages/fetch/fetch.go b/internal/exec/stages/fetch/fetch.go -index ce50c360..93cdbfcc 100644 +index 0d03c987..511d26d6 100644 --- a/internal/exec/stages/fetch/fetch.go +++ b/internal/exec/stages/fetch/fetch.go @@ -19,12 +19,12 @@ package fetch import ( -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/exec/stages" - "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/exec/stages" + "github.com/flatcar/ignition/v2/internal/exec/util" + "github.com/flatcar/ignition/v2/internal/log" @@ -5165,7 +5886,7 @@ index ce50c360..93cdbfcc 100644 const ( diff --git a/internal/exec/stages/fetch_offline/fetch-offline.go b/internal/exec/stages/fetch_offline/fetch-offline.go -index e87e853d..1b88b60d 100644 +index 46dc146f..375b18a0 100644 --- a/internal/exec/stages/fetch_offline/fetch-offline.go +++ b/internal/exec/stages/fetch_offline/fetch-offline.go @@ -22,14 +22,14 @@ import ( @@ -5173,7 +5894,7 @@ index e87e853d..1b88b60d 100644 "reflect" - cfgutil "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/exec/stages" - executil "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/internal/log" @@ -5181,7 +5902,7 @@ index e87e853d..1b88b60d 100644 - "github.com/coreos/ignition/v2/internal/state" - "github.com/coreos/ignition/v2/internal/util" + cfgutil "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/exec/stages" + executil "github.com/flatcar/ignition/v2/internal/exec/util" + "github.com/flatcar/ignition/v2/internal/log" @@ -5192,7 +5913,7 @@ index e87e853d..1b88b60d 100644 const ( diff --git a/internal/exec/stages/fetch_offline/fetch_offline_test.go b/internal/exec/stages/fetch_offline/fetch_offline_test.go -index 04237ecb..30c77f4a 100644 +index df72415b..06577083 100644 --- a/internal/exec/stages/fetch_offline/fetch_offline_test.go +++ b/internal/exec/stages/fetch_offline/fetch_offline_test.go @@ -17,8 +17,8 @@ package fetch_offline @@ -5200,28 +5921,28 @@ index 04237ecb..30c77f4a 100644 "testing" - "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" "github.com/stretchr/testify/assert" ) diff --git a/internal/exec/stages/files/files.go b/internal/exec/stages/files/files.go -index d2f86bc8..ddbdbac2 100644 +index 13f0fe11..8d19d4e3 100644 --- a/internal/exec/stages/files/files.go +++ b/internal/exec/stages/files/files.go @@ -20,13 +20,13 @@ import ( "os" "path/filepath" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/exec/stages" - "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/exec/stages" + "github.com/flatcar/ignition/v2/internal/exec/util" @@ -5232,22 +5953,22 @@ index d2f86bc8..ddbdbac2 100644 const ( diff --git a/internal/exec/stages/files/files_test.go b/internal/exec/stages/files/files_test.go -index 8555be1c..a0c7275b 100644 +index 1d9683e6..fdc870b3 100644 --- a/internal/exec/stages/files/files_test.go +++ b/internal/exec/stages/files/files_test.go @@ -19,8 +19,8 @@ import ( "sort" "testing" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/exec/util" ) func TestEntrySort(t *testing.T) { diff --git a/internal/exec/stages/files/filesystemEntries.go b/internal/exec/stages/files/filesystemEntries.go -index e977b10e..8320349d 100644 +index d01554a1..9fc40ff1 100644 --- a/internal/exec/stages/files/filesystemEntries.go +++ b/internal/exec/stages/files/filesystemEntries.go @@ -24,11 +24,11 @@ import ( @@ -5255,12 +5976,12 @@ index e977b10e..8320349d 100644 "time" - cutil "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/internal/log" + cutil "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/exec/util" + "github.com/flatcar/ignition/v2/internal/log" @@ -5277,7 +5998,7 @@ index e977b10e..8320349d 100644 return entries, nil diff --git a/internal/exec/stages/files/passwd.go b/internal/exec/stages/files/passwd.go -index fa3ffd7d..7d1472b7 100644 +index 737e9cce..2c3e0d11 100644 --- a/internal/exec/stages/files/passwd.go +++ b/internal/exec/stages/files/passwd.go @@ -18,8 +18,8 @@ import ( @@ -5285,14 +6006,14 @@ index fa3ffd7d..7d1472b7 100644 "path/filepath" - "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" ) func (s *stage) expandGlobList(globs ...string) ([]string, error) { diff --git a/internal/exec/stages/files/units.go b/internal/exec/stages/files/units.go -index 097452bf..b8f46f85 100644 +index d690f054..aefd91e7 100644 --- a/internal/exec/stages/files/units.go +++ b/internal/exec/stages/files/units.go @@ -21,11 +21,11 @@ import ( @@ -5301,19 +6022,28 @@ index 097452bf..b8f46f85 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - cutil "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/internal/systemd" + "github.com/flatcar/ignition/v2/config/shared/errors" + cutil "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/exec/util" + "github.com/flatcar/ignition/v2/internal/systemd" ) // Preset holds the information about +@@ -45,7 +45,7 @@ func (s *stage) warnOnOldSystemdVersion() error { + return err + } + if systemdVersion < 240 { +- s.Warning("The version of systemd (%q) is less than 240. Enabling/disabling instantiated units may not work. See https://github.com/coreos/ignition/issues/586 for more information.", systemdVersion) ++ s.Warning("The version of systemd (%q) is less than 240. Enabling/disabling instantiated units may not work. See https://github.com/flatcar/ignition/issues/586 for more information.", systemdVersion) + } + return nil + } diff --git a/internal/exec/stages/files/units_test.go b/internal/exec/stages/files/units_test.go -index 96f53888..3bb96d78 100644 +index e435d4c3..4acd9feb 100644 --- a/internal/exec/stages/files/units_test.go +++ b/internal/exec/stages/files/units_test.go @@ -18,8 +18,8 @@ import ( @@ -5321,28 +6051,28 @@ index 96f53888..3bb96d78 100644 "testing" - "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" ) func TestParseInstanceUnit(t *testing.T) { diff --git a/internal/exec/stages/kargs/kargs.go b/internal/exec/stages/kargs/kargs.go -index 57c709dd..837becd7 100644 +index d03b0aae..92d67cae 100644 --- a/internal/exec/stages/kargs/kargs.go +++ b/internal/exec/stages/kargs/kargs.go @@ -19,13 +19,13 @@ import ( "fmt" "os/exec" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/exec/stages" - "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/exec/stages" + "github.com/flatcar/ignition/v2/internal/exec/util" @@ -5353,7 +6083,7 @@ index 57c709dd..837becd7 100644 const ( diff --git a/internal/exec/stages/mount/mount.go b/internal/exec/stages/mount/mount.go -index 11492e0a..72bd781e 100644 +index a5aa1f8b..bc0bf534 100644 --- a/internal/exec/stages/mount/mount.go +++ b/internal/exec/stages/mount/mount.go @@ -27,14 +27,14 @@ import ( @@ -5361,7 +6091,7 @@ index 11492e0a..72bd781e 100644 "strings" - cutil "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/exec/stages" - "github.com/coreos/ignition/v2/internal/exec/util" @@ -5369,7 +6099,7 @@ index 11492e0a..72bd781e 100644 - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" + cutil "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/exec/stages" + "github.com/flatcar/ignition/v2/internal/exec/util" @@ -5380,19 +6110,19 @@ index 11492e0a..72bd781e 100644 const ( diff --git a/internal/exec/stages/stages.go b/internal/exec/stages/stages.go -index a9a6fe19..b47a5452 100644 +index ef32b5f0..4ac38628 100644 --- a/internal/exec/stages/stages.go +++ b/internal/exec/stages/stages.go @@ -15,11 +15,11 @@ package stages import ( -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/registry" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/registry" + "github.com/flatcar/ignition/v2/internal/resource" @@ -5401,7 +6131,7 @@ index a9a6fe19..b47a5452 100644 // Stage is responsible for actually executing a stage of the configuration. diff --git a/internal/exec/stages/umount/umount.go b/internal/exec/stages/umount/umount.go -index e167a178..8b425859 100644 +index 9e002d5f..ec749fc7 100644 --- a/internal/exec/stages/umount/umount.go +++ b/internal/exec/stages/umount/umount.go @@ -22,13 +22,13 @@ import ( @@ -5409,14 +6139,14 @@ index e167a178..8b425859 100644 "sort" - cutil "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/exec/stages" - "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" + cutil "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/exec/stages" + "github.com/flatcar/ignition/v2/internal/exec/util" + "github.com/flatcar/ignition/v2/internal/log" @@ -5426,10 +6156,10 @@ index e167a178..8b425859 100644 "golang.org/x/sys/unix" ) diff --git a/internal/exec/util/blkid.go b/internal/exec/util/blkid.go -index 9574cb33..6d5e2621 100644 +index 35ebbffb..1fa6306c 100644 --- a/internal/exec/util/blkid.go +++ b/internal/exec/util/blkid.go -@@ -33,7 +33,7 @@ import ( +@@ -32,7 +32,7 @@ import ( "strings" "unsafe" @@ -5439,7 +6169,7 @@ index 9574cb33..6d5e2621 100644 const ( diff --git a/internal/exec/util/file.go b/internal/exec/util/file.go -index 1fb9fbbb..d7a78767 100644 +index d646cf38..2c096e87 100644 --- a/internal/exec/util/file.go +++ b/internal/exec/util/file.go @@ -26,11 +26,11 @@ import ( @@ -5447,12 +6177,12 @@ index 1fb9fbbb..d7a78767 100644 "syscall" - cutil "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/util" + cutil "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/internal/util" @@ -5460,7 +6190,7 @@ index 1fb9fbbb..d7a78767 100644 "golang.org/x/sys/unix" ) diff --git a/internal/exec/util/passwd.go b/internal/exec/util/passwd.go -index edd91a83..3b39d4e7 100644 +index 049a26dd..32cb28e3 100644 --- a/internal/exec/util/passwd.go +++ b/internal/exec/util/passwd.go @@ -24,10 +24,10 @@ import ( @@ -5468,11 +6198,11 @@ index edd91a83..3b39d4e7 100644 "github.com/coreos/go-systemd/v22/journal" - "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/as_user" - "github.com/coreos/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/as_user" + "github.com/flatcar/ignition/v2/internal/distro" "golang.org/x/sys/unix" @@ -5492,16 +6222,16 @@ index 79e8f5f1..70c1cb7b 100644 const ( diff --git a/internal/exec/util/unit.go b/internal/exec/util/unit.go -index e945db66..32d12b28 100644 +index d70c3199..2a42465d 100644 --- a/internal/exec/util/unit.go +++ b/internal/exec/util/unit.go @@ -22,8 +22,8 @@ import ( "path/filepath" "syscall" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" "github.com/vincent-petithory/dataurl" @@ -5566,19 +6296,19 @@ index 4d636a39..20f57845 100644 ) diff --git a/internal/platform/platform.go b/internal/platform/platform.go -index 9b01df0c..beb6d447 100644 +index a4815261..c09a5cb9 100644 --- a/internal/platform/platform.go +++ b/internal/platform/platform.go @@ -18,11 +18,11 @@ import ( "errors" "fmt" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/registry" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/registry" + "github.com/flatcar/ignition/v2/internal/resource" @@ -5587,18 +6317,18 @@ index 9b01df0c..beb6d447 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/akamai/akamai.go b/internal/providers/akamai/akamai.go -index 6af75dc4..0fb8bcbc 100644 +index 6003acb1..c8b5db1a 100644 --- a/internal/providers/akamai/akamai.go +++ b/internal/providers/akamai/akamai.go @@ -24,10 +24,10 @@ import ( "net/http" "net/url" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" @@ -5606,18 +6336,18 @@ index 6af75dc4..0fb8bcbc 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/aliyun/aliyun.go b/internal/providers/aliyun/aliyun.go -index d5089c45..23da8ddb 100644 +index ff956a4d..2b4832e6 100644 --- a/internal/providers/aliyun/aliyun.go +++ b/internal/providers/aliyun/aliyun.go @@ -20,10 +20,10 @@ package aliyun import ( "net/url" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" @@ -5625,19 +6355,19 @@ index d5089c45..23da8ddb 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/applehv/applehv.go b/internal/providers/applehv/applehv.go -index 2fffec9c..f4117b1a 100644 +index a89d3687..73ea49f5 100644 --- a/internal/providers/applehv/applehv.go +++ b/internal/providers/applehv/applehv.go -@@ -22,11 +22,11 @@ import ( - "net/http" +@@ -23,11 +23,11 @@ import ( + "os" "os/exec" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" @@ -5646,19 +6376,19 @@ index 2fffec9c..f4117b1a 100644 "github.com/mdlayher/vsock" ) diff --git a/internal/providers/aws/aws.go b/internal/providers/aws/aws.go -index 742005ed..247e3be0 100644 +index ed6e6763..26a2c7a4 100644 --- a/internal/providers/aws/aws.go +++ b/internal/providers/aws/aws.go @@ -24,11 +24,11 @@ import ( "net/url" "time" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" @@ -5676,7 +6406,7 @@ index 742005ed..247e3be0 100644 // TODO: investigate alternative solutions (adding a Retryer to the // aws.Config, fetching the region from an HTTP URL, handle the diff --git a/internal/providers/azure/azure.go b/internal/providers/azure/azure.go -index 09de9591..0d1d1767 100644 +index 610db4e0..e6876cf0 100644 --- a/internal/providers/azure/azure.go +++ b/internal/providers/azure/azure.go @@ -26,13 +26,13 @@ import ( @@ -5684,14 +6414,14 @@ index 09de9591..0d1d1767 100644 "github.com/Azure/azure-sdk-for-go/sdk/azidentity" - "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - execUtil "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + execUtil "github.com/flatcar/ignition/v2/internal/exec/util" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/platform" @@ -5710,18 +6440,18 @@ index 09de9591..0d1d1767 100644 404, // not found 410, // gone diff --git a/internal/providers/azurestack/azurestack.go b/internal/providers/azurestack/azurestack.go -index 5468bad3..69152d86 100644 +index 06e2705b..7b128ef2 100644 --- a/internal/providers/azurestack/azurestack.go +++ b/internal/providers/azurestack/azurestack.go @@ -18,10 +18,10 @@ package azurestack import ( -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/azure" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/azure" + "github.com/flatcar/ignition/v2/internal/resource" @@ -5729,21 +6459,21 @@ index 5468bad3..69152d86 100644 ) diff --git a/internal/providers/cloudstack/cloudstack.go b/internal/providers/cloudstack/cloudstack.go -index f91fea82..e4657505 100644 +index 0a27874c..db931000 100644 --- a/internal/providers/cloudstack/cloudstack.go +++ b/internal/providers/cloudstack/cloudstack.go @@ -30,13 +30,13 @@ import ( "strings" "time" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" - ut "github.com/coreos/ignition/v2/internal/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/platform" @@ -5763,20 +6493,20 @@ index f91fea82..e4657505 100644 return types.Config{}, report.Report{}, resource.ErrNeedNet } diff --git a/internal/providers/cmdline/cmdline.go b/internal/providers/cmdline/cmdline.go -index 745f0687..30203bff 100644 +index b0d774ff..ad5a8426 100644 --- a/internal/providers/cmdline/cmdline.go +++ b/internal/providers/cmdline/cmdline.go @@ -22,12 +22,12 @@ import ( "os" "strings" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/platform" @@ -5786,18 +6516,18 @@ index 745f0687..30203bff 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/digitalocean/digitalocean.go b/internal/providers/digitalocean/digitalocean.go -index 00684dc5..638ac1d9 100644 +index bbf4f757..6402c631 100644 --- a/internal/providers/digitalocean/digitalocean.go +++ b/internal/providers/digitalocean/digitalocean.go @@ -20,10 +20,10 @@ package digitalocean import ( "net/url" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" @@ -5805,18 +6535,18 @@ index 00684dc5..638ac1d9 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/exoscale/exoscale.go b/internal/providers/exoscale/exoscale.go -index cb8afd54..a6d553c5 100644 +index 59d35107..3583f8a3 100644 --- a/internal/providers/exoscale/exoscale.go +++ b/internal/providers/exoscale/exoscale.go @@ -20,10 +20,10 @@ package exoscale import ( "net/url" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" @@ -5824,18 +6554,18 @@ index cb8afd54..a6d553c5 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/file/file.go b/internal/providers/file/file.go -index 7ec28b2a..af5da9c8 100644 +index 224ae6f9..285755c9 100644 --- a/internal/providers/file/file.go +++ b/internal/providers/file/file.go @@ -17,10 +17,10 @@ package file import ( "os" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" @@ -5843,18 +6573,18 @@ index 7ec28b2a..af5da9c8 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/gcp/gcp.go b/internal/providers/gcp/gcp.go -index 36627fbf..9f9b4b42 100644 +index b1fa5b5d..0197e87c 100644 --- a/internal/providers/gcp/gcp.go +++ b/internal/providers/gcp/gcp.go @@ -21,10 +21,10 @@ import ( "net/http" "net/url" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" @@ -5862,18 +6592,18 @@ index 36627fbf..9f9b4b42 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/hetzner/hetzner.go b/internal/providers/hetzner/hetzner.go -index dca9c0f9..11695d6e 100644 +index 2faecbc9..4510c648 100644 --- a/internal/providers/hetzner/hetzner.go +++ b/internal/providers/hetzner/hetzner.go @@ -20,10 +20,10 @@ package hetzner import ( "net/url" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" @@ -5881,21 +6611,21 @@ index dca9c0f9..11695d6e 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/hyperv/kvp.go b/internal/providers/hyperv/kvp.go -index 8162e506..f0bb3e9b 100644 +index df71a214..09e77fb4 100644 --- a/internal/providers/hyperv/kvp.go +++ b/internal/providers/hyperv/kvp.go -@@ -20,12 +20,12 @@ import ( +@@ -21,12 +21,12 @@ import ( "path/filepath" "github.com/containers/libhvee/pkg/kvp" - "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" @@ -5904,21 +6634,21 @@ index 8162e506..f0bb3e9b 100644 ) diff --git a/internal/providers/ibmcloud/ibmcloud.go b/internal/providers/ibmcloud/ibmcloud.go -index df43ba98..c3e877dc 100644 +index 8faec1f6..14dedea1 100644 --- a/internal/providers/ibmcloud/ibmcloud.go +++ b/internal/providers/ibmcloud/ibmcloud.go @@ -26,13 +26,13 @@ import ( "path/filepath" "time" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" - ut "github.com/coreos/ignition/v2/internal/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/platform" @@ -5929,21 +6659,21 @@ index df43ba98..c3e877dc 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/kubevirt/kubevirt.go b/internal/providers/kubevirt/kubevirt.go -index d3a19fbc..bae57323 100644 +index dc77bcc3..f00c5215 100644 --- a/internal/providers/kubevirt/kubevirt.go +++ b/internal/providers/kubevirt/kubevirt.go @@ -27,13 +27,13 @@ import ( "sync" "time" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" - ut "github.com/coreos/ignition/v2/internal/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/platform" @@ -5954,7 +6684,7 @@ index d3a19fbc..bae57323 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/metal/metal.go b/internal/providers/metal/metal.go -index 1870cbdb..27c923d4 100644 +index 83158866..5e65ad22 100644 --- a/internal/providers/metal/metal.go +++ b/internal/providers/metal/metal.go @@ -17,10 +17,10 @@ @@ -5962,32 +6692,32 @@ index 1870cbdb..27c923d4 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/nutanix/nutanix.go b/internal/providers/nutanix/nutanix.go -index 75fc8f7f..be64c83e 100644 +index 32b18f84..4e0c36d1 100644 --- a/internal/providers/nutanix/nutanix.go +++ b/internal/providers/nutanix/nutanix.go @@ -25,13 +25,13 @@ import ( "path/filepath" "time" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" - ut "github.com/coreos/ignition/v2/internal/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/platform" @@ -5995,24 +6725,45 @@ index 75fc8f7f..be64c83e 100644 + "github.com/flatcar/ignition/v2/internal/resource" + ut "github.com/flatcar/ignition/v2/internal/util" + "github.com/coreos/vcontext/report" + ) +diff --git a/internal/providers/nvidiabluefield/nvidiabluefield.go b/internal/providers/nvidiabluefield/nvidiabluefield.go +index 5afc6752..c650400a 100644 +--- a/internal/providers/nvidiabluefield/nvidiabluefield.go ++++ b/internal/providers/nvidiabluefield/nvidiabluefield.go +@@ -22,11 +22,11 @@ import ( + "os" + "os/exec" + +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" +- "github.com/coreos/ignition/v2/internal/distro" +- "github.com/coreos/ignition/v2/internal/platform" +- "github.com/coreos/ignition/v2/internal/providers/util" +- "github.com/coreos/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/platform" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" + "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/openstack/openstack.go b/internal/providers/openstack/openstack.go -index 836845d1..1f591713 100644 +index 803c6f39..398dcac8 100644 --- a/internal/providers/openstack/openstack.go +++ b/internal/providers/openstack/openstack.go -@@ -28,13 +28,13 @@ import ( - "path/filepath" +@@ -31,13 +31,13 @@ import ( + "sync" "time" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" - ut "github.com/coreos/ignition/v2/internal/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/platform" @@ -6022,7 +6773,7 @@ index 836845d1..1f591713 100644 "github.com/coreos/vcontext/report" ) -@@ -66,7 +66,7 @@ func init() { +@@ -77,7 +77,7 @@ func init() { func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { // The fetch-offline approach doesn't work well here because of the "split // personality" of this provider. See: @@ -6032,18 +6783,18 @@ index 836845d1..1f591713 100644 return types.Config{}, report.Report{}, resource.ErrNeedNet } diff --git a/internal/providers/oraclecloud/oraclecloud.go b/internal/providers/oraclecloud/oraclecloud.go -index fb06caf5..9ef71e47 100644 +index 4ad38252..f2cbca33 100644 --- a/internal/providers/oraclecloud/oraclecloud.go +++ b/internal/providers/oraclecloud/oraclecloud.go @@ -24,10 +24,10 @@ import ( "net/http" "net/url" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" @@ -6051,18 +6802,18 @@ index fb06caf5..9ef71e47 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/packet/packet.go b/internal/providers/packet/packet.go -index e497b659..29fa6815 100644 +index fe4636d2..1f16b4c1 100644 --- a/internal/providers/packet/packet.go +++ b/internal/providers/packet/packet.go @@ -25,10 +25,10 @@ import ( "net/url" "strings" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" @@ -6070,21 +6821,21 @@ index e497b659..29fa6815 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/powervs/powervs.go b/internal/providers/powervs/powervs.go -index 0d8a4052..a4372f6e 100644 +index cdbb5e0c..e6a957bd 100644 --- a/internal/providers/powervs/powervs.go +++ b/internal/providers/powervs/powervs.go @@ -24,13 +24,13 @@ import ( "path/filepath" "time" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" - ut "github.com/coreos/ignition/v2/internal/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/platform" @@ -6095,21 +6846,21 @@ index 0d8a4052..a4372f6e 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/proxmoxve/proxmoxve.go b/internal/providers/proxmoxve/proxmoxve.go -index 37b715a2..68389998 100644 +index ca603e9c..6cc27f0d 100644 --- a/internal/providers/proxmoxve/proxmoxve.go +++ b/internal/providers/proxmoxve/proxmoxve.go @@ -28,13 +28,13 @@ import ( "path/filepath" "time" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" - ut "github.com/coreos/ignition/v2/internal/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/platform" @@ -6120,20 +6871,20 @@ index 37b715a2..68389998 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/qemu/qemu_blockdev.go b/internal/providers/qemu/qemu_blockdev.go -index f78b52b1..04bcc3b7 100644 +index 3fff4d0a..8b5e90dc 100644 --- a/internal/providers/qemu/qemu_blockdev.go +++ b/internal/providers/qemu/qemu_blockdev.go -@@ -27,12 +27,12 @@ import ( +@@ -26,12 +26,12 @@ import ( "os/exec" "time" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/platform" @@ -6143,19 +6894,19 @@ index f78b52b1..04bcc3b7 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/qemu/qemu_fwcfg.go b/internal/providers/qemu/qemu_fwcfg.go -index 7dc56fba..863c9601 100644 +index 4014876d..a0b25902 100644 --- a/internal/providers/qemu/qemu_fwcfg.go +++ b/internal/providers/qemu/qemu_fwcfg.go -@@ -29,11 +29,11 @@ import ( +@@ -28,11 +28,11 @@ import ( "strings" "time" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" @@ -6164,18 +6915,18 @@ index 7dc56fba..863c9601 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/scaleway/scaleway.go b/internal/providers/scaleway/scaleway.go -index d25b9aab..f2a6e131 100644 +index 855d6547..05f47e9b 100644 --- a/internal/providers/scaleway/scaleway.go +++ b/internal/providers/scaleway/scaleway.go @@ -22,10 +22,10 @@ import ( "math/rand" "net/url" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" @@ -6183,22 +6934,22 @@ index d25b9aab..f2a6e131 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/system/system.go b/internal/providers/system/system.go -index b676e683..cdf39841 100644 +index 319b736c..6bc61f22 100644 --- a/internal/providers/system/system.go +++ b/internal/providers/system/system.go @@ -18,13 +18,13 @@ import ( "os" "path/filepath" -- latest "github.com/coreos/ignition/v2/config/v3_6_experimental" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- latest "github.com/coreos/ignition/v2/config/v3_7_experimental" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ latest "github.com/flatcar/ignition/v2/config/v3_6_experimental" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ latest "github.com/flatcar/ignition/v2/config/v3_7_experimental" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/platform" @@ -6208,18 +6959,18 @@ index b676e683..cdf39841 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/upcloud/upcloud.go b/internal/providers/upcloud/upcloud.go -index bec73a7b..0e206d95 100644 +index 5f78cda5..f348f9ab 100644 --- a/internal/providers/upcloud/upcloud.go +++ b/internal/providers/upcloud/upcloud.go @@ -21,10 +21,10 @@ package upcloud import ( "net/url" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" @@ -6227,7 +6978,7 @@ index bec73a7b..0e206d95 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/util/config.go b/internal/providers/util/config.go -index 52ea51b0..fc85389f 100644 +index 2ee8e51f..c995939d 100644 --- a/internal/providers/util/config.go +++ b/internal/providers/util/config.go @@ -18,9 +18,9 @@ import ( @@ -6235,16 +6986,16 @@ index 52ea51b0..fc85389f 100644 "encoding/hex" - "github.com/coreos/ignition/v2/config" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/config" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/log" "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/util/file.go b/internal/providers/util/file.go -index 26f01870..929e3d1c 100644 +index 5e48c56b..fd7216a1 100644 --- a/internal/providers/util/file.go +++ b/internal/providers/util/file.go @@ -15,8 +15,8 @@ @@ -6252,9 +7003,9 @@ index 26f01870..929e3d1c 100644 import ( - "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" "github.com/vincent-petithory/dataurl" ) @@ -6272,7 +7023,7 @@ index 84323de7..e07ec78a 100644 func TestTryUnzip(t *testing.T) { diff --git a/internal/providers/virtualbox/virtualbox.go b/internal/providers/virtualbox/virtualbox.go -index bfc424cc..421534d3 100644 +index ccf9f433..4279bf07 100644 --- a/internal/providers/virtualbox/virtualbox.go +++ b/internal/providers/virtualbox/virtualbox.go @@ -31,11 +31,11 @@ import ( @@ -6280,12 +7031,12 @@ index bfc424cc..421534d3 100644 "unsafe" - "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" @@ -6293,18 +7044,18 @@ index bfc424cc..421534d3 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/vmware/vmware_amd64.go b/internal/providers/vmware/vmware_amd64.go -index cab0aa40..597c33fd 100644 +index 08569249..e6fd09c6 100644 --- a/internal/providers/vmware/vmware_amd64.go +++ b/internal/providers/vmware/vmware_amd64.go @@ -20,10 +20,10 @@ package vmware import ( "fmt" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" @@ -6312,35 +7063,35 @@ index cab0aa40..597c33fd 100644 "github.com/coreos/vcontext/report" "github.com/vmware/vmw-guestinfo/rpcvmx" diff --git a/internal/providers/vmware/vmware_unsupported.go b/internal/providers/vmware/vmware_unsupported.go -index 201404c1..3a1c18b9 100644 +index ea3684a6..b828f4e9 100644 --- a/internal/providers/vmware/vmware_unsupported.go +++ b/internal/providers/vmware/vmware_unsupported.go -@@ -23,9 +23,9 @@ package vmware +@@ -22,9 +22,9 @@ package vmware import ( "errors" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/vultr/vultr.go b/internal/providers/vultr/vultr.go -index e5111c6e..70aacc17 100644 +index 5f96588e..da8eb1c5 100644 --- a/internal/providers/vultr/vultr.go +++ b/internal/providers/vultr/vultr.go @@ -21,10 +21,10 @@ package vultr import ( "net/url" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" @@ -6348,7 +7099,7 @@ index e5111c6e..70aacc17 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/zvm/zvm.go b/internal/providers/zvm/zvm.go -index 7f57fb54..729a312c 100644 +index c8509125..981d2b09 100644 --- a/internal/providers/zvm/zvm.go +++ b/internal/providers/zvm/zvm.go @@ -24,13 +24,13 @@ import ( @@ -6356,14 +7107,14 @@ index 7f57fb54..729a312c 100644 "strings" - "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/platform" @@ -6373,10 +7124,10 @@ index 7f57fb54..729a312c 100644 ) diff --git a/internal/register/providers.go b/internal/register/providers.go -index 0e337358..7c7ae52b 100644 +index 7cde7f74..93ef2a02 100644 --- a/internal/register/providers.go +++ b/internal/register/providers.go -@@ -15,33 +15,33 @@ +@@ -15,34 +15,34 @@ package register import ( @@ -6397,6 +7148,7 @@ index 0e337358..7c7ae52b 100644 - _ "github.com/coreos/ignition/v2/internal/providers/kubevirt" - _ "github.com/coreos/ignition/v2/internal/providers/metal" - _ "github.com/coreos/ignition/v2/internal/providers/nutanix" +- _ "github.com/coreos/ignition/v2/internal/providers/nvidiabluefield" - _ "github.com/coreos/ignition/v2/internal/providers/openstack" - _ "github.com/coreos/ignition/v2/internal/providers/oraclecloud" - _ "github.com/coreos/ignition/v2/internal/providers/packet" @@ -6426,6 +7178,7 @@ index 0e337358..7c7ae52b 100644 + _ "github.com/flatcar/ignition/v2/internal/providers/kubevirt" + _ "github.com/flatcar/ignition/v2/internal/providers/metal" + _ "github.com/flatcar/ignition/v2/internal/providers/nutanix" ++ _ "github.com/flatcar/ignition/v2/internal/providers/nvidiabluefield" + _ "github.com/flatcar/ignition/v2/internal/providers/openstack" + _ "github.com/flatcar/ignition/v2/internal/providers/oraclecloud" + _ "github.com/flatcar/ignition/v2/internal/providers/packet" @@ -6463,21 +7216,21 @@ index 98c05214..b8043835 100644 + _ "github.com/flatcar/ignition/v2/internal/exec/stages/umount" ) diff --git a/internal/resource/http.go b/internal/resource/http.go -index 197f5731..05463dd7 100644 +index da1541fd..dcf2fe1d 100644 --- a/internal/resource/http.go +++ b/internal/resource/http.go -@@ -28,12 +28,12 @@ import ( +@@ -29,12 +29,12 @@ import ( "strings" "time" - ignerrors "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/earlyrand" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/util" - "github.com/coreos/ignition/v2/internal/version" + ignerrors "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/earlyrand" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/util" @@ -6485,11 +7238,20 @@ index 197f5731..05463dd7 100644 "github.com/vincent-petithory/dataurl" +@@ -255,7 +255,7 @@ func defaultHTTPClient() (*http.Client, error) { + // > is of concern in your application, use getrandom(2) or + // > /dev/random instead. + // +- // See https://github.com/coreos/ignition/issues/645 ++ // See https://github.com/flatcar/ignition/issues/645 + urand, err := earlyrand.UrandomReader() + if err != nil { + return nil, err diff --git a/internal/resource/url.go b/internal/resource/url.go -index 0a35f995..5f08f059 100644 +index 18b6d746..8d00d823 100644 --- a/internal/resource/url.go +++ b/internal/resource/url.go -@@ -33,9 +33,9 @@ import ( +@@ -35,15 +35,15 @@ import ( "cloud.google.com/go/compute/metadata" "cloud.google.com/go/storage" @@ -6499,11 +7261,19 @@ index 0a35f995..5f08f059 100644 + configErrors "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/util" + "github.com/coreos/vcontext/report" "golang.org/x/oauth2/google" "google.golang.org/api/option" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" +- providersUtil "github.com/coreos/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" ++ providersUtil "github.com/flatcar/ignition/v2/internal/providers/util" + + "github.com/Azure/azure-sdk-for-go/sdk/azidentity" + "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob" diff --git a/internal/resource/url_test.go b/internal/resource/url_test.go -index ed1c2d6a..41c0e354 100644 +index 4394e4ca..24a982cd 100644 --- a/internal/resource/url_test.go +++ b/internal/resource/url_test.go @@ -24,9 +24,9 @@ import ( @@ -6520,7 +7290,7 @@ index ed1c2d6a..41c0e354 100644 func TestDataUrl(t *testing.T) { diff --git a/internal/sgdisk/sgdisk.go b/internal/sgdisk/sgdisk.go -index 1b276704..fa96bf15 100644 +index ffd3d9ca..587b94dd 100644 --- a/internal/sgdisk/sgdisk.go +++ b/internal/sgdisk/sgdisk.go @@ -19,10 +19,10 @@ import ( @@ -6528,26 +7298,26 @@ index 1b276704..fa96bf15 100644 "os/exec" - "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" ) type Operation struct { diff --git a/internal/state/state.go b/internal/state/state.go -index 30fb3873..e12cd726 100644 +index 8aa0ec90..95d582da 100644 --- a/internal/state/state.go +++ b/internal/state/state.go @@ -20,7 +20,7 @@ import ( "os" "path/filepath" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" ) type State struct { @@ -6565,28 +7335,28 @@ index 11731ada..8d516fca 100644 // Specific section marker used in the docs to indicate that the Markdown code diff --git a/internal/util/verification.go b/internal/util/verification.go -index 453120cd..39d7200d 100644 +index 070003db..07f5af75 100644 --- a/internal/util/verification.go +++ b/internal/util/verification.go @@ -23,7 +23,7 @@ import ( "hash" "strings" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" ) var ( diff --git a/internal/util/verification_test.go b/internal/util/verification_test.go -index e4ad12ee..122934f1 100644 +index dd919cc0..07de9fc4 100644 --- a/internal/util/verification_test.go +++ b/internal/util/verification_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" ) func TestAssertValid(t *testing.T) { @@ -6751,7 +7521,7 @@ index e62ee681..b3aff932 100644 func init() { diff --git a/tests/negative/general/config.go b/tests/negative/general/config.go -index 9c1960be..d5918581 100644 +index 91ab153f..fc4b215b 100644 --- a/tests/negative/general/config.go +++ b/tests/negative/general/config.go @@ -17,8 +17,8 @@ package general @@ -6888,7 +7658,7 @@ index 5bda64c1..056aa259 100644 func init() { diff --git a/tests/positive/files/file.go b/tests/positive/files/file.go -index d99944a0..6998d346 100644 +index bd2d952a..0b885225 100644 --- a/tests/positive/files/file.go +++ b/tests/positive/files/file.go @@ -15,8 +15,8 @@ @@ -7231,7 +8001,7 @@ index 10d32990..d53a7bd5 100644 func init() { diff --git a/tests/positive/passwd/users.go b/tests/positive/passwd/users.go -index b199cae6..0dd2d13e 100644 +index 9648beb0..def58e65 100644 --- a/tests/positive/passwd/users.go +++ b/tests/positive/passwd/users.go @@ -15,8 +15,8 @@ @@ -7340,10 +8110,10 @@ index 34408293..24a0bc61 100644 func init() { diff --git a/tests/register/register.go b/tests/register/register.go -index 576a57ca..571a76db 100644 +index 6d047abd..f48edc07 100644 --- a/tests/register/register.go +++ b/tests/register/register.go -@@ -16,14 +16,14 @@ package register +@@ -16,15 +16,15 @@ package register import ( "github.com/coreos/go-semver/semver" @@ -7353,7 +8123,8 @@ index 576a57ca..571a76db 100644 - types33 "github.com/coreos/ignition/v2/config/v3_3/types" - types34 "github.com/coreos/ignition/v2/config/v3_4/types" - types35 "github.com/coreos/ignition/v2/config/v3_5/types" -- types_exp "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- types36 "github.com/coreos/ignition/v2/config/v3_6/types" +- types_exp "github.com/coreos/ignition/v2/config/v3_7_experimental/types" - "github.com/coreos/ignition/v2/tests/types" + types30 "github.com/flatcar/ignition/v2/config/v3_0/types" + types31 "github.com/flatcar/ignition/v2/config/v3_1/types" @@ -7361,7 +8132,8 @@ index 576a57ca..571a76db 100644 + types33 "github.com/flatcar/ignition/v2/config/v3_3/types" + types34 "github.com/flatcar/ignition/v2/config/v3_4/types" + types35 "github.com/flatcar/ignition/v2/config/v3_5/types" -+ types_exp "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ types36 "github.com/flatcar/ignition/v2/config/v3_6/types" ++ types_exp "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" + "github.com/flatcar/ignition/v2/tests/types" ) @@ -7416,7 +8188,7 @@ index dc0f01fa..77207404 100644 + _ "github.com/flatcar/ignition/v2/tests/positive/timeouts" ) diff --git a/tests/servers/servers.go b/tests/servers/servers.go -index 0230cd16..a4d235a2 100644 +index eccb6122..9c42f254 100644 --- a/tests/servers/servers.go +++ b/tests/servers/servers.go @@ -27,7 +27,7 @@ import ( @@ -7459,5 +8231,5 @@ index f32eb29b..390f5ef8 100644 var ( -- -2.53.0 +2.54.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch index f32ac170702..bbca6675c93 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch @@ -1,7 +1,7 @@ -From 84fab357258a5f8e4391e38dceb2a053d6bf9ec4 Mon Sep 17 00:00:00 2001 +From f57b41faa275285dafb9df26285e35dd34722738 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 26 Sep 2022 12:12:04 +0200 -Subject: [PATCH 02/20] config: add ignition translation +Subject: [PATCH 02/19] config: add ignition translation it's a merge from flatcar/ign-converter @@ -2621,5 +2621,5 @@ index 00000000..e81f6bed + } +} -- -2.53.0 +2.54.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch index a262259de69..8689999ec27 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch @@ -1,7 +1,7 @@ -From b07614bc00ce9f6e5c8ed70f0dc15ef615900e9c Mon Sep 17 00:00:00 2001 +From 8a2a8ef62e4dc4e4910e5cb0d855e665282e83e7 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Tue, 12 Aug 2025 15:10:05 +0200 -Subject: [PATCH 03/20] mod: add flatcar/ignition@0.36.2 +Date: Thu, 20 Aug 2026 14:22:56 +0200 +Subject: [PATCH 03/19] mod: add flatcar/ignition@0.36.2 it's required for Ignition conversion. @@ -12,7 +12,7 @@ Signed-off-by: Mathieu Tortuyaux 2 files changed, 40 insertions(+) diff --git a/go.mod b/go.mod -index ab37e13c..8df40512 100644 +index 0c090c5b..3336ee38 100644 --- a/go.mod +++ b/go.mod @@ -19,6 +19,7 @@ require ( @@ -20,48 +20,48 @@ index ab37e13c..8df40512 100644 github.com/coreos/go-systemd/v22 v22.6.0 github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 + github.com/flatcar/ignition v0.36.2 - github.com/google/renameio/v2 v2.0.0 + github.com/google/renameio/v2 v2.0.1 github.com/google/uuid v1.6.0 github.com/mdlayher/vsock v1.2.1 @@ -48,6 +49,7 @@ require ( - github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.54.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0 // indirect + github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17 // indirect @@ -60,6 +62,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect + github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f // indirect github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb // indirect + github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect + github.com/envoyproxy/go-control-plane/envoy v1.35.0 // indirect github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect -@@ -89,6 +92,7 @@ require ( - go.opentelemetry.io/otel/sdk v1.37.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect - go.opentelemetry.io/otel/trace v1.37.0 // indirect +@@ -88,6 +91,7 @@ require ( + go.opentelemetry.io/otel/sdk v1.38.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect + go.opentelemetry.io/otel/trace v1.38.0 // indirect + go4.org v0.0.0-20160314031811-03efcb870d84 // indirect - golang.org/x/crypto v0.43.0 // indirect - golang.org/x/sync v0.17.0 // indirect - golang.org/x/text v0.30.0 // indirect + golang.org/x/crypto v0.47.0 // indirect + golang.org/x/sync v0.19.0 // indirect + golang.org/x/text v0.33.0 // indirect diff --git a/go.sum b/go.sum -index 217fbf7c..9f997768 100644 +index fd027529..40bae9cb 100644 --- a/go.sum +++ b/go.sum @@ -44,6 +44,9 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0 - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.53.0/go.mod h1:jUZ5LYlw40WMd07qxcQJD5M40aUxrfwqQX1g7zxYnrQ= - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 h1:Ron4zCA/yk6U7WOBXhTJcDpsUBG9npumK6xw2auFltQ= - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0/go.mod h1:cSgYe11MCNYunTnRXrKiR/tHc0eoKjICUuWpNZoVCOo= + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.54.0/go.mod h1:vB2GH9GAYYJTO3mEn8oYwzEdhlayZIdQz6zdzgUIRvA= + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0 h1:s0WlVbf9qpvkh1c/uDAPElam0WrL7fHRIidgZJ7UqZI= + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0/go.mod h1:Mf6O40IAyB9zR/1J8nGDDPirZQQPbYJni8Yisy7NTMc= +github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 h1:gZCtZ+Hh/e3CGEX8q/yAcp8wWu5ZS6NMk6VGzpQhI3s= +github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437/go.mod h1:otnto4/Icqn88WCcM4bhIJNSgsh9VLBuspyyCfvof9c= +github.com/aws/aws-sdk-go v1.8.39/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k= - github.com/aws/aws-sdk-go-v2 v1.39.2 h1:EJLg8IdbzgeD7xgvZ+I8M1e0fL0ptn/M47lianzth0I= - github.com/aws/aws-sdk-go-v2 v1.39.2/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 h1:i8p8P4diljCr60PpJp6qZXNlgX4m2yQFpYk+9ZT+J4E= -@@ -92,12 +95,16 @@ github.com/containers/libhvee v0.10.0 h1:7VLv8keWZpHuGmWvyY4c1mVH5V1JYb1G78VC+8A + github.com/aws/aws-sdk-go-v2 v1.41.1 h1:ABlyEARCDLN034NhxlRUSZr4l71mh+T5KAeGh6cerhU= + github.com/aws/aws-sdk-go-v2 v1.41.1/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0= + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 h1:489krEF9xIGkOaaX3CE/Be2uWjiXrkCH6gUX+bZA/BU= +@@ -94,12 +97,16 @@ github.com/containers/libhvee v0.10.0 h1:7VLv8keWZpHuGmWvyY4c1mVH5V1JYb1G78VC+8A github.com/containers/libhvee v0.10.0/go.mod h1:at0h8lRcK5jCKfQgU/e6Io0Mw12F36zRLjXVOXRoDTM= github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb h1:rmqyI19j3Z/74bIRhuC59RB442rXUazKNueVpfJPxg4= github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb/go.mod h1:rcFZM3uxVvdyNmsAV2jopgPD1cs5SPWJWU5dOz2LUnw= @@ -77,18 +77,18 @@ index 217fbf7c..9f997768 100644 +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= - github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M= -@@ -110,6 +117,9 @@ github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfU + github.com/envoyproxy/go-control-plane v0.13.5-0.20251024222203-75eaa193e329 h1:K+fnvUM0VZ7ZFJf0n4L/BRlnsb9pL/GuDG6FqaH+PwM= +@@ -112,6 +119,9 @@ github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfU github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/flatcar/ignition v0.36.2 h1:xGHgScUe0P4Fkprjqv7L2CE58emiQgP833OCCn9z2v4= +github.com/flatcar/ignition v0.36.2/go.mod h1:uk1tpzLFRXus4RrvzgMI+IqmmB8a/RGFSBlI+tMTbbA= +github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= - github.com/go-jose/go-jose/v4 v4.1.1 h1:JYhSgy4mXXzAdF3nUx3ygx347LRXJRrpgyU3adRmkAI= - github.com/go-jose/go-jose/v4 v4.1.1/go.mod h1:BdsZGqgdO3b6tTc6LSE56wcDbMMLuPsw5d4ZD5f94kA= + github.com/go-jose/go-jose/v4 v4.1.3 h1:CVLmWDhDVRa6Mi/IgCgaopNosCaHz7zrMeF9MlZRkrs= + github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -@@ -117,6 +127,7 @@ github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +@@ -119,6 +129,7 @@ github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= @@ -96,17 +96,17 @@ index 217fbf7c..9f997768 100644 github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo= -@@ -137,6 +148,9 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU - github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA= - github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo= - github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld9rcmyfL1OZhoc= +@@ -139,6 +150,9 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.7 h1:zrn2Ee/nWmHulBx5sAV + github.com/googleapis/enterprise-certificate-proxy v0.3.7/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA= + github.com/googleapis/gax-go/v2 v2.16.0 h1:iHbQmKLLZrexmb0OSsNGTeSTS0HO4YvFOG8g5E4Zd0Y= + github.com/googleapis/gax-go/v2 v2.16.0/go.mod h1:o1vfQjjNZn4+dPnRdl/4ZD7S9414Y4xA+a/6Icj6l14= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/keybase/go-keychain v0.0.1 h1:way+bWYa6lDppZoZcgMbYsvC7GxljxrskdNInRtuthU= github.com/keybase/go-keychain v0.0.1/go.mod h1:PdEILRW3i9D8JcdM+FmY6RwkHGnhHxXwkPPMeUgOK1k= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -@@ -153,26 +167,36 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1 +@@ -155,26 +169,36 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= @@ -120,16 +120,16 @@ index 217fbf7c..9f997768 100644 +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= - github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= - github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= + github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= + github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= +github.com/sigma/bdoor v0.0.0-20160202064022-babf2a4017b0/go.mod h1:WBu7REWbxC/s/J06jsk//d+9DOz9BbsmcIrimuGRFbs= +github.com/sigma/vmw-guestinfo v0.0.0-20160204083807-95dd4126d6e8/go.mod h1:JrRFFC0veyh0cibh0DAhriSY7/gV3kDdNaVUOmfx01U= +github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= +github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM= github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= - github.com/spiffe/go-spiffe/v2 v2.5.0 h1:N2I01KCUkv1FAjZXJMwh95KK1ZIQLYbPfhaxw8WS0hE= - github.com/spiffe/go-spiffe/v2 v2.5.0/go.mod h1:P+NxobPc6wXhVtINNtFjNWGBTreew1GBUCwT2wPmb7g= + github.com/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsbLuo= + github.com/spiffe/go-spiffe/v2 v2.6.0/go.mod h1:gm2SeUoMZEtpnzPNs2Csc0D/gX33k1xIx7lEzqblHEs= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= @@ -140,42 +140,42 @@ index 217fbf7c..9f997768 100644 github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3 h1:v6jG/tdl4O07LNVp74Nt7/OyL+1JsIW1M2f/nSvQheY= github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3/go.mod h1:CSBTxrhePCm0cmXNKDGeu+6bOQzpaEklfCqEpn89JWk= +github.com/vmware/vmw-ovflib v0.0.0-20170608004843-1f217b9dc714/go.mod h1:jiPk45kn7klhByRvUq5i2vo1RtHKBHj+iWGFpxbXuuI= - github.com/zeebo/errs v1.4.0 h1:XNdoD/RRMKP7HD0UhJnIzUy74ISdGGxURlYG8HSWSfM= - github.com/zeebo/errs v1.4.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4= - go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= -@@ -195,21 +219,31 @@ go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFh - go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps= - go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4= - go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0= + go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= + go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= + go.opentelemetry.io/contrib/detectors/gcp v1.38.0 h1:ZoYbqX7OaA/TAikspPl3ozPI6iY6LiIY9I8cUfm+pJs= +@@ -195,21 +219,31 @@ go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6 + go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= + go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= + go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs= +go4.org v0.0.0-20160314031811-03efcb870d84 h1:WZkGC1qzoax/QSt84wmvIxk+ZOmGIChsTzdrv9t4nvk= +go4.org v0.0.0-20160314031811-03efcb870d84/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= - golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04= - golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0= + golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8= + golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= - golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4= - golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210= - golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY= - golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA= - golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= - golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= + golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o= + golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8= + golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw= + golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA= + golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= + golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= - golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= + golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= + golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= - golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= - golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= - golang.org/x/time v0.13.0 h1:eUlYslOIt32DgYD6utsuUeHs4d7AsEYLuIAdg7FlYgI= - golang.org/x/time v0.13.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= + golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE= + golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8= + golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= + golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= - google.golang.org/api v0.252.0 h1:xfKJeAJaMwb8OC9fesr369rjciQ704AjU/psjkKURSI= -@@ -227,5 +261,7 @@ google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j + google.golang.org/api v0.259.0 h1:90TaGVIxScrh1Vn/XI2426kRpBqHwWIzVBzJsVZ5XrQ= +@@ -227,5 +261,7 @@ google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -184,5 +184,5 @@ index 217fbf7c..9f997768 100644 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -- -2.53.0 +2.54.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-config-v3_6-convert-ignition-2.x-to-3.x.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-config-v3_7-convert-ignition-2.x-to-3.x.patch similarity index 76% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-config-v3_6-convert-ignition-2.x-to-3.x.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-config-v3_7-convert-ignition-2.x-to-3.x.patch index dc5dd31ff3e..8c7c862b550 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-config-v3_6-convert-ignition-2.x-to-3.x.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-config-v3_7-convert-ignition-2.x-to-3.x.patch @@ -1,7 +1,7 @@ -From a844690078a4b72a59569bda1dd2f42a73e124b9 Mon Sep 17 00:00:00 2001 +From 18a1200935058a9ab8afc9c05532c62a7344bdfb Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Thu, 24 Oct 2024 10:20:45 +0200 -Subject: [PATCH 04/20] config/v3_6: convert ignition 2.x to 3.x +Date: Thu, 20 Aug 2026 14:23:22 +0200 +Subject: [PATCH 04/19] config/v3_7: convert ignition 2.x to 3.x if the version of ignition is 2.x we convert it to 3.x using ign-converter. @@ -10,15 +10,15 @@ it should support any 2.x version Signed-off-by: Mathieu Tortuyaux --- - config/v3_6_experimental/config.go | 37 ++++++++++++++++++++++++++++++ + config/v3_7_experimental/config.go | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) -diff --git a/config/v3_6_experimental/config.go b/config/v3_6_experimental/config.go -index 3be26cae..ea367663 100644 ---- a/config/v3_6_experimental/config.go -+++ b/config/v3_6_experimental/config.go +diff --git a/config/v3_7_experimental/config.go b/config/v3_7_experimental/config.go +index 8d02129e..18193de1 100644 +--- a/config/v3_7_experimental/config.go ++++ b/config/v3_7_experimental/config.go @@ -15,9 +15,14 @@ - package v3_6_experimental + package v3_7_experimental import ( + "encoding/json" @@ -29,9 +29,9 @@ index 3be26cae..ea367663 100644 "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/flatcar/ignition/v2/config/util" + "github.com/flatcar/ignition/v2/config/v24tov31" - prev "github.com/flatcar/ignition/v2/config/v3_5" - "github.com/flatcar/ignition/v2/config/v3_6_experimental/translate" - "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" + prev "github.com/flatcar/ignition/v2/config/v3_6" + "github.com/flatcar/ignition/v2/config/v3_7_experimental/translate" + "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" @@ -67,6 +72,38 @@ func ParseCompatibleVersion(raw []byte) (types.Config, report.Report, error) { return types.Config{}, rpt, err } @@ -72,5 +72,5 @@ index 3be26cae..ea367663 100644 return Parse(raw) } -- -2.53.0 +2.54.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch index cf2d0f21731..7ed6af4c7fa 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch @@ -1,7 +1,7 @@ -From 2f2966af34f99767b48722702119e4ab36e0670f Mon Sep 17 00:00:00 2001 +From 6357e8465cd9dc5a008fb45a8505ba628924df81 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Tue, 12 Aug 2025 15:10:57 +0200 -Subject: [PATCH 05/20] vendor: go mod vendor +Date: Thu, 20 Aug 2026 14:24:00 +0200 +Subject: [PATCH 05/19] vendor: go mod vendor Signed-off-by: Mathieu Tortuyaux --- @@ -17029,18 +17029,18 @@ index 00000000..1b1efb0f + return +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index 2b1e4041..0161a31b 100644 +index 36c02885..a36e3fa1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -132,6 +132,9 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric - # github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 - ## explicit; go 1.23.0 + # github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0 + ## explicit; go 1.24.0 github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping +# github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 +## explicit +github.com/ajeddeloh/go-json - # github.com/aws/aws-sdk-go-v2 v1.39.2 - ## explicit; go 1.22 + # github.com/aws/aws-sdk-go-v2 v1.41.1 + ## explicit; go 1.23 github.com/aws/aws-sdk-go-v2/aws @@ -255,6 +258,9 @@ github.com/coreos/go-json # github.com/coreos/go-semver v0.3.1 @@ -17077,19 +17077,19 @@ index 2b1e4041..0161a31b 100644 +github.com/flatcar/ignition/config/validate/astjson +github.com/flatcar/ignition/config/validate/astnode +github.com/flatcar/ignition/config/validate/report - # github.com/go-jose/go-jose/v4 v4.1.1 - ## explicit; go 1.23.0 + # github.com/go-jose/go-jose/v4 v4.1.3 + ## explicit; go 1.24.0 github.com/go-jose/go-jose/v4 -@@ -500,6 +527,9 @@ go.opentelemetry.io/otel/trace +@@ -496,6 +523,9 @@ go.opentelemetry.io/otel/trace go.opentelemetry.io/otel/trace/embedded go.opentelemetry.io/otel/trace/internal/telemetry go.opentelemetry.io/otel/trace/noop +# go4.org v0.0.0-20160314031811-03efcb870d84 +## explicit +go4.org/errorutil - # golang.org/x/crypto v0.43.0 + # golang.org/x/crypto v0.47.0 ## explicit; go 1.24.0 golang.org/x/crypto/chacha20 -- -2.53.0 +2.54.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patch.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patch.patch index 8d72cee23cc..a6ec15f8ca8 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patch.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patch.patch @@ -1,7 +1,7 @@ -From f747e3a0045985ffe0ee445d1daef09154443770 Mon Sep 17 00:00:00 2001 +From cbb7198259089a4be64ed3b452d05dda114e3b1c Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 19 Feb 2024 18:12:22 +0100 -Subject: [PATCH 06/20] internal/prv/cmdline: backport flatcar patch +Subject: [PATCH 06/19] internal/prv/cmdline: backport flatcar patch this patch provides backward compatibility for various config key @@ -12,7 +12,7 @@ Signed-off-by: Mathieu Tortuyaux 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/providers/cmdline/cmdline.go b/internal/providers/cmdline/cmdline.go -index 30203bff..86a5cb79 100644 +index ad5a8426..d7a164a9 100644 --- a/internal/providers/cmdline/cmdline.go +++ b/internal/providers/cmdline/cmdline.go @@ -33,7 +33,9 @@ import ( @@ -36,5 +36,5 @@ index 30203bff..86a5cb79 100644 } -- -2.53.0 +2.54.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch index 613356072b7..1350c4bdbd8 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch @@ -1,44 +1,46 @@ -From 2b6ce6afda965f8c37d26321b523acb8462f1258 Mon Sep 17 00:00:00 2001 +From 5c38c01e21c6616c4a1e78b35e2f0764cbbd1b94 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Tue, 20 Feb 2024 10:02:28 +0100 -Subject: [PATCH 07/20] provider/qemu: apply fw_cfg patch +Date: Thu, 20 Aug 2026 15:11:57 +0200 +Subject: [PATCH 07/19] provider/qemu: apply fw_cfg patch we support both CoreOS and Flatcar fw_cfg path to ensure compatiblity Signed-off-by: Mathieu Tortuyaux --- - internal/providers/qemu/qemu_fwcfg.go | 133 ++++++++++++++------------ - 1 file changed, 70 insertions(+), 63 deletions(-) + internal/providers/qemu/qemu_fwcfg.go | 138 ++++++++++++++------------ + 1 file changed, 72 insertions(+), 66 deletions(-) diff --git a/internal/providers/qemu/qemu_fwcfg.go b/internal/providers/qemu/qemu_fwcfg.go -index 863c9601..e8d4fec7 100644 +index a0b25902..3fc04aa3 100644 --- a/internal/providers/qemu/qemu_fwcfg.go +++ b/internal/providers/qemu/qemu_fwcfg.go -@@ -29,6 +29,7 @@ import ( +@@ -28,6 +28,7 @@ import ( "strings" "time" -+ iErrors "github.com/flatcar/ignition/v2/config/shared/errors" - "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ iErrors "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" "github.com/flatcar/ignition/v2/internal/distro" "github.com/flatcar/ignition/v2/internal/platform" -@@ -38,9 +39,11 @@ import ( +@@ -37,10 +38,12 @@ import ( "github.com/coreos/vcontext/report" ) -const ( - firmwareConfigPath = "/sys/firmware/qemu_fw_cfg/by_name/opt/com.coreos/config/raw" - firmwareConfigSizePath = "/sys/firmware/qemu_fw_cfg/by_name/opt/com.coreos/config/size" +-) +var ( + firmwareConfigPaths = map[string]string{ + "/sys/firmware/qemu_fw_cfg/by_name/opt/org.flatcar-linux/config/raw": "/sys/firmware/qemu_fw_cfg/by_name/opt/org.flatcar-linux/config/size", + "/sys/firmware/qemu_fw_cfg/by_name/opt/com.coreos/config/raw": "/sys/firmware/qemu_fw_cfg/by_name/opt/com.coreos/config/size", + } - ) ++) func init() { -@@ -56,72 +59,76 @@ func fetchConfig(f *resource.Fetcher) (cfg types.Config, rpt report.Report, err - return + platform.Register(platform.Provider{ +@@ -57,72 +60,75 @@ func fetchConfig(f *resource.Fetcher) (cfg types.Config, rpt report.Report, err + } } - // get size of firmware blob, if it exists @@ -58,24 +60,7 @@ index 863c9601..e8d4fec7 100644 - f.Logger.Err("couldn't parse QEMU firmware config size: %v", err) - return - } -+ for cfgPath, sizePath := range firmwareConfigPaths { -+ // get size of firmware blob, if it exists -+ var sizeBytes []byte -+ sizeBytes, err = os.ReadFile(sizePath) -+ if os.IsNotExist(err) { -+ f.Logger.Info("QEMU firmware config was not found. Ignoring...") -+ continue -+ } else if err != nil { -+ f.Logger.Err("couldn't read QEMU firmware config size: %v", err) -+ return -+ } -+ var size int -+ size, err = strconv.Atoi(strings.TrimSpace(string(sizeBytes))) -+ if err != nil { -+ f.Logger.Err("couldn't parse QEMU firmware config size: %v", err) -+ return -+ } - +- - // Read firmware blob. We need to make as few, large read() calls as - // possible, since the qemu_fw_cfg kernel module takes O(offset) - // time for each read syscall. os.ReadFile() would eventually @@ -99,6 +84,24 @@ index 863c9601..e8d4fec7 100644 - // where it would return io.EOF - var n int - n, err = fh.Read(data[len(data):cap(data)]) ++ for cfgPath, sizePath := range firmwareConfigPaths { ++ // get size of firmware blob, if it exists ++ var sizeBytes []byte ++ sizeBytes, err = os.ReadFile(sizePath) ++ if os.IsNotExist(err) { ++ f.Logger.Info("QEMU firmware config was not found. Ignoring...") ++ continue ++ } else if err != nil { ++ f.Logger.Err("couldn't read QEMU firmware config size: %v", err) ++ return ++ } ++ var size int ++ size, err = strconv.Atoi(strings.TrimSpace(string(sizeBytes))) ++ if err != nil { ++ f.Logger.Err("couldn't parse QEMU firmware config size: %v", err) ++ return ++ } ++ + // Read firmware blob. We need to make as few, large read() calls as + // possible, since the qemu_fw_cfg kernel module takes O(offset) + // time for each read syscall. os.ReadFile() would eventually @@ -118,7 +121,7 @@ index 863c9601..e8d4fec7 100644 - f.Logger.Warning("Reading QEMU fw_cfg takes quadratic time. Consider moving large files or config fragments to a remote URL.") - reporting = true + defer func() { -+ fh.Close() ++ _ = fh.Close() + }() + lastReport := time.Now() + reporting := false @@ -162,7 +165,6 @@ index 863c9601..e8d4fec7 100644 + // of the file so the extra read would be maximally expensive. + cfg, rpt, err = util.ParseConfig(f.Logger, data) return -+ } - // If size is not at a page boundary, we know we're at EOF because - // the guard byte was not filled. If size is at a page boundary, @@ -171,9 +173,10 @@ index 863c9601..e8d4fec7 100644 - // of the file so the extra read would be maximally expensive. - cfg, rpt, err = util.ParseConfig(f.Logger, data) - return -+ return types.Config{}, report.Report{}, iErrors.ErrEmpty -+ - } +-} ++ return types.Config{}, report.Report{}, iErrors.ErrEmpty ++ ++ } -- -2.53.0 +2.54.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-config-3_6-test-add-ignition-2.x-test-cases.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-config-3_6-test-add-ignition-2.x-test-cases.patch deleted file mode 100644 index 6aecc332bda..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-config-3_6-test-add-ignition-2.x-test-cases.patch +++ /dev/null @@ -1,44 +0,0 @@ -From d7dfe59d0e768c0a5646bd85f677c2eeb80dfd67 Mon Sep 17 00:00:00 2001 -From: Mathieu Tortuyaux -Date: Thu, 2 Sep 2021 11:03:17 +0200 -Subject: [PATCH 08/20] config/3_6/test: add ignition 2.x test cases - -Signed-off-by: Mathieu Tortuyaux ---- - config/v3_6_experimental/config_test.go | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/config/v3_6_experimental/config_test.go b/config/v3_6_experimental/config_test.go -index 54cbd91c..99f2e3dd 100644 ---- a/config/v3_6_experimental/config_test.go -+++ b/config/v3_6_experimental/config_test.go -@@ -165,6 +165,26 @@ func TestParse(t *testing.T) { - in in - out out - }{ -+ { -+ in: in{config: []byte(`{"ignition": {"version": "2.0.0"}}`)}, -+ out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}}, -+ }, -+ { -+ in: in{config: []byte(`{"ignition": {"version": "2.1.0"}}`)}, -+ out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}}, -+ }, -+ { -+ in: in{config: []byte(`{"ignition": {"version": "2.2.0"}}`)}, -+ out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}}, -+ }, -+ { -+ in: in{config: []byte(`{"ignition": {"version": "2.3.0"}}`)}, -+ out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}}, -+ }, -+ { -+ in: in{config: []byte(`{"ignition": {"version": "2.4.0"}}`)}, -+ out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}}, -+ }, - { - in: in{config: []byte(`{"ignition": {"version": "3.0.0"}}`)}, - out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}}, --- -2.53.0 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch similarity index 91% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch index 5d6d0171992..3e5b89797a7 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch @@ -1,7 +1,7 @@ -From 09d762d8d295316a27d5efa4c32de587a5d8f1ea Mon Sep 17 00:00:00 2001 +From b3d28f4138837555b62bf00d9124189b9fba29fd Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 22 Sep 2021 14:53:49 +0200 -Subject: [PATCH 09/20] internal/disk/fs: ignore fs format mismatches for the +Subject: [PATCH 08/19] internal/disk/fs: ignore fs format mismatches for the OEM partition As soon as the OEM partition's filesystem format changes, all users @@ -22,7 +22,7 @@ Signed-off-by: Mathieu Tortuyaux 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/exec/stages/disks/filesystems.go b/internal/exec/stages/disks/filesystems.go -index a12c59d7..360267ff 100644 +index 28a931d6..2114e713 100644 --- a/internal/exec/stages/disks/filesystems.go +++ b/internal/exec/stages/disks/filesystems.go @@ -126,7 +126,7 @@ func (s stage) createFilesystem(fs types.Filesystem) error { @@ -35,5 +35,5 @@ index a12c59d7..360267ff 100644 (fs.UUID == nil || canonicalizeFilesystemUUID(info.Type, info.UUID) == canonicalizeFilesystemUUID(fileSystemFormat, *fs.UUID)) { s.Info("filesystem at %q is already correctly formatted. Skipping mkfs...", fs.Device) -- -2.53.0 +2.54.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch similarity index 95% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch index 71a70e731e0..97dc475a2cd 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch @@ -1,7 +1,7 @@ -From 8f216e3b97915cfb4dd3e17b09904c5d4f83c03c Mon Sep 17 00:00:00 2001 +From 7b7a299eb4304b156f5fe74d6a01e2ffd8879df4 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 20 Feb 2024 10:12:02 +0100 -Subject: [PATCH 10/20] VMware: Fix guestinfo.*.config.data and *.config.url +Subject: [PATCH 09/19] VMware: Fix guestinfo.*.config.data and *.config.url variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -26,7 +26,7 @@ Signed-off-by: Mathieu Tortuyaux 1 file changed, 71 insertions(+), 22 deletions(-) diff --git a/internal/providers/vmware/vmware_amd64.go b/internal/providers/vmware/vmware_amd64.go -index 597c33fd..3680a4cd 100644 +index e6fd09c6..a485b97b 100644 --- a/internal/providers/vmware/vmware_amd64.go +++ b/internal/providers/vmware/vmware_amd64.go @@ -19,6 +19,7 @@ package vmware @@ -35,7 +35,7 @@ index 597c33fd..3680a4cd 100644 "fmt" + "net/url" - "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" + "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" "github.com/flatcar/ignition/v2/internal/platform" @@ -58,26 +59,83 @@ func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { return types.Config{}, report.Report{}, platform.ErrNoProvider @@ -164,5 +164,5 @@ index 597c33fd..3680a4cd 100644 func delConfig(f *resource.Fetcher) error { -- -2.53.0 +2.54.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-config-version-handle-configuration-version-1.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-config-version-handle-configuration-version-1.patch similarity index 91% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-config-version-handle-configuration-version-1.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-config-version-handle-configuration-version-1.patch index 16706c4221c..0c89297d7a1 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-config-version-handle-configuration-version-1.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-config-version-handle-configuration-version-1.patch @@ -1,7 +1,7 @@ -From d2f3c9ca92ad65d21d752d92e68533eee04a6319 Mon Sep 17 00:00:00 2001 +From 6e16eb458d8c7a9d7804832aa37a0a8dceb20de5 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 2 Feb 2022 13:27:18 +0100 -Subject: [PATCH 11/20] config/version: handle configuration version 1 +Subject: [PATCH 10/19] config/version: handle configuration version 1 version 2 should be able to translate configuration version 1 but the `GetConfigVersion` was not able to detect version 1 configuration since for this particular @@ -49,5 +49,5 @@ index 3b9bb22f..f81056fa 100644 return semver.Version{}, report.Report{}, errors.ErrInvalidVersion } -- -2.53.0 +2.54.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-util-add-cloud-init-detection-to-initial-pars.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-config-util-add-cloud-init-detection-to-initial-pars.patch similarity index 95% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-util-add-cloud-init-detection-to-initial-pars.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-config-util-add-cloud-init-detection-to-initial-pars.patch index 63b7633adf8..ad36b28e46d 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-util-add-cloud-init-detection-to-initial-pars.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-config-util-add-cloud-init-detection-to-initial-pars.patch @@ -1,7 +1,7 @@ -From 1aaa6a5de8a7d778de6be224966d57242db9b2ea Mon Sep 17 00:00:00 2001 +From 24ebb8d1b0ed9b33343666f1c674ac6fd3ca9248 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 22 Feb 2022 15:41:13 +0100 -Subject: [PATCH 12/20] config/util: add cloud init detection to initial +Subject: [PATCH 11/19] config/util: add cloud init detection to initial parsing we detect if the config is not an ignition one (script/cloudinit) and we @@ -90,5 +90,5 @@ index 865d75d2..313d42ea 100644 if err == nil { return report.Report{}, nil -- -2.53.0 +2.54.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-Partially-revert-drop-OEM-URI-support.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-Partially-revert-drop-OEM-URI-support.patch similarity index 65% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-Partially-revert-drop-OEM-URI-support.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-Partially-revert-drop-OEM-URI-support.patch index 19ccd784edf..e3ade4b11cc 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-Partially-revert-drop-OEM-URI-support.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-Partially-revert-drop-OEM-URI-support.patch @@ -1,21 +1,20 @@ -From 80163399609ab18b97cc8aaba63f1fca205b0cfb Mon Sep 17 00:00:00 2001 +From 3a322043816015861d66d416822ef273c0919012 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Wed, 1 Apr 2026 16:11:52 +0100 -Subject: [PATCH 13/20] Partially revert "*: drop OEM URI support" +Subject: [PATCH 12/19] Partially revert "*: drop OEM URI support" This partially reverts commit 0c088d6de77aa1b1f47b9252a07f51cb1e249df3. Signed-off-by: James Le Cuirot --- - config/v3_0/types/url.go | 2 +- - config/v3_1/types/url.go | 2 +- - config/v3_2/types/url.go | 2 +- - config/v3_3/types/url.go | 2 +- - config/v3_4/types/url.go | 2 +- - docs/supported-platforms.md | 2 ++ - internal/distro/distro.go | 3 +++ - internal/resource/url.go | 27 +++++++++++++++++++++++++++ - 8 files changed, 37 insertions(+), 5 deletions(-) + config/v3_0/types/url.go | 2 +- + config/v3_1/types/url.go | 2 +- + config/v3_2/types/url.go | 2 +- + config/v3_3/types/url.go | 2 +- + config/v3_4/types/url.go | 2 +- + internal/distro/distro.go | 3 +++ + internal/resource/url.go | 29 ++++++++++++++++++++++++++++- + 7 files changed, 36 insertions(+), 6 deletions(-) diff --git a/config/v3_0/types/url.go b/config/v3_0/types/url.go index 2d8c44b1..f560bc22 100644 @@ -82,21 +81,8 @@ index b1f96337..752044ce 100644 return nil case "s3": if v, ok := u.Query()["versionId"]; ok { -diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md -index afd49437..897eeabd 100644 ---- a/docs/supported-platforms.md -+++ b/docs/supported-platforms.md -@@ -12,6 +12,8 @@ Ignition is currently supported for the following platforms: - * [Amazon Web Services] (`aws`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately. - * [Microsoft Azure] (`azure`)- Ignition will read its configuration from the custom data provided to the instance. Cloud SSH keys are handled separately. - * [Microsoft Azure Stack] (`azurestack`) - Ignition will read its configuration from the custom data provided to the instance. Cloud SSH keys are handled separately. -+* Bare Metal - Use the `ignition.config.url` kernel parameter to provide a URL to the configuration. The URL can use the `http://`, `https://`, `tftp://`, `s3://`, or `gs://` schemes to specify a remote config or the `oem://` scheme to specify a local config, rooted in `/usr/share/oem`. -+* PXE - Use the `ignition.config.url` and first boot kernel parameters to provide a URL to the configuration. The URL can use the `http://`, `https://`, `tftp://`, or `s3://` schemes to specify a remote config or the `oem://` scheme to specify a local config, rooted in `/usr/share/oem`. - * [Brightbox] (`brightbox`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately. - * [CloudStack] (`cloudstack`) - Ignition will read its configuration from the instance userdata via either metadata service or config drive. Cloud SSH keys are handled separately. - * [DigitalOcean] (`digitalocean`) - Ignition will read its configuration from the droplet userdata. Cloud SSH keys and network configuration are handled separately. diff --git a/internal/distro/distro.go b/internal/distro/distro.go -index 9d9351e7..fb12b792 100644 +index 235882d5..98d0625d 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go @@ -30,6 +30,8 @@ var ( @@ -108,35 +94,40 @@ index 9d9351e7..fb12b792 100644 // Helper programs groupaddCmd = "groupadd" -@@ -88,6 +90,7 @@ func DiskByLabelDir() string { return diskByLabelDir } +@@ -89,6 +91,7 @@ func DiskByLabelDir() string { return diskByLabelDir } func KernelCmdlinePath() string { return kernelCmdlinePath } func BootIDPath() string { return bootIDPath } func SystemConfigDir() string { return fromEnv("SYSTEM_CONFIG_DIR", systemConfigDir) } +func OEMLookasideDir() string { return fromEnv("OEM_LOOKASIDE_DIR", oemLookasideDir) } func GroupaddCmd() string { return groupaddCmd } - func GroupdelCmd() string { return groupdelCmd } + func GroupmodCmd() string { return groupmodCmd } diff --git a/internal/resource/url.go b/internal/resource/url.go -index 5f08f059..ab1d80fa 100644 +index 8d00d823..10af133b 100644 --- a/internal/resource/url.go +++ b/internal/resource/url.go -@@ -27,6 +27,7 @@ import ( - "net/http" +@@ -28,6 +28,7 @@ import ( + "net/netip" "net/url" "os" + "path/filepath" "strings" + "sync" "syscall" - "time" -@@ -34,6 +35,7 @@ import ( +@@ -35,10 +36,11 @@ import ( + "cloud.google.com/go/compute/metadata" "cloud.google.com/go/storage" ++ "github.com/coreos/vcontext/report" configErrors "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/internal/distro" "github.com/flatcar/ignition/v2/internal/log" "github.com/flatcar/ignition/v2/internal/util" +- "github.com/coreos/vcontext/report" "golang.org/x/oauth2/google" -@@ -165,6 +167,8 @@ func (f *Fetcher) FetchToBuffer(u url.URL, opts FetchOptions) ([]byte, error) { + "google.golang.org/api/option" + +@@ -176,6 +178,8 @@ func (f *Fetcher) FetchToBuffer(u url.URL, opts FetchOptions) ([]byte, error) { err = f.fetchFromTFTP(u, dest, opts) case "data": err = f.fetchFromDataURL(u, dest, opts) @@ -145,7 +136,7 @@ index 5f08f059..ab1d80fa 100644 case "s3", "arn": buf := &s3buf{ WriteAtBuffer: manager.NewWriteAtBuffer([]byte{}), -@@ -237,6 +241,8 @@ func (f *Fetcher) Fetch(u url.URL, dest *os.File, opts FetchOptions) error { +@@ -248,6 +252,8 @@ func (f *Fetcher) Fetch(u url.URL, dest *os.File, opts FetchOptions) error { return f.fetchFromTFTP(u, dest, opts) case "data": return f.fetchFromDataURL(u, dest, opts) @@ -154,7 +145,7 @@ index 5f08f059..ab1d80fa 100644 case "s3", "arn": return f.fetchFromS3(u, dest, opts) case "gs": -@@ -447,6 +453,27 @@ type s3target interface { +@@ -465,6 +471,27 @@ type s3target interface { io.ReadSeeker } @@ -183,5 +174,5 @@ index 5f08f059..ab1d80fa 100644 // dest, returning an error if one is encountered. It will attempt to acquire // IAM credentials from the EC2 metadata service, and if this fails will attempt -- -2.53.0 +2.54.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-config-Support-oem-schema-in-newer-config-spec-versi.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-Support-oem-schema-in-newer-config-spec-versi.patch similarity index 50% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-config-Support-oem-schema-in-newer-config-spec-versi.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-Support-oem-schema-in-newer-config-spec-versi.patch index e8d71ea4619..f1fcde867ee 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-config-Support-oem-schema-in-newer-config-spec-versi.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-Support-oem-schema-in-newer-config-spec-versi.patch @@ -1,14 +1,16 @@ -From 59f688e325c701e98cfe921cf115216970280d0a Mon Sep 17 00:00:00 2001 +From 4cb701db0bcf6e315a9b83ffac2acf0ab8daa03c Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Mon, 6 Apr 2026 13:13:58 +0100 -Subject: [PATCH 14/20] config: Support oem:// schema in newer config spec +Subject: [PATCH 13/19] config: Support oem:// schema in newer config spec versions Signed-off-by: James Le Cuirot +Signed-off-by: Mathieu Tortuyaux --- config/v3_5/types/url.go | 2 +- - config/v3_6_experimental/types/url.go | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + config/v3_6/types/url.go | 2 +- + config/v3_7_experimental/types/url.go | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/v3_5/types/url.go b/config/v3_5/types/url.go index b1f96337..752044ce 100644 @@ -23,10 +25,23 @@ index b1f96337..752044ce 100644 return nil case "s3": if v, ok := u.Query()["versionId"]; ok { -diff --git a/config/v3_6_experimental/types/url.go b/config/v3_6_experimental/types/url.go +diff --git a/config/v3_6/types/url.go b/config/v3_6/types/url.go index b1f96337..752044ce 100644 ---- a/config/v3_6_experimental/types/url.go -+++ b/config/v3_6_experimental/types/url.go +--- a/config/v3_6/types/url.go ++++ b/config/v3_6/types/url.go +@@ -32,7 +32,7 @@ func validateURL(s string) error { + } + + switch u.Scheme { +- case "http", "https", "tftp", "gs": ++ case "http", "https", "tftp", "gs", "oem": + return nil + case "s3": + if v, ok := u.Query()["versionId"]; ok { +diff --git a/config/v3_7_experimental/types/url.go b/config/v3_7_experimental/types/url.go +index b1f96337..752044ce 100644 +--- a/config/v3_7_experimental/types/url.go ++++ b/config/v3_7_experimental/types/url.go @@ -32,7 +32,7 @@ func validateURL(s string) error { } @@ -37,5 +52,5 @@ index b1f96337..752044ce 100644 case "s3": if v, ok := u.Query()["versionId"]; ok { -- -2.53.0 +2.54.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-translation-support-OEM-and-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-translation-support-OEM-and-oem.patch similarity index 97% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-translation-support-OEM-and-oem.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-translation-support-OEM-and-oem.patch index b261365a3d8..50455e4794a 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-translation-support-OEM-and-oem.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-translation-support-OEM-and-oem.patch @@ -1,7 +1,7 @@ -From 9a109e005920191bfa1599b6a9972285e6b49bba Mon Sep 17 00:00:00 2001 +From 820949eec50518f34b528082b34acc732ac2763f Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 10 Nov 2022 11:58:49 +0100 -Subject: [PATCH 15/20] translation: support OEM and oem +Subject: [PATCH 14/19] translation: support OEM and oem Signed-off-by: Mathieu Tortuyaux --- @@ -157,5 +157,5 @@ index e81f6bed..68c07109 100644 + } +} -- -2.53.0 +2.54.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-usr-share-oem-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-usr-share-oem-oem.patch new file mode 100644 index 00000000000..bbde24fe943 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-usr-share-oem-oem.patch @@ -0,0 +1,44 @@ +From becd01b0e801430a97a9abb82ec984b1af32d110 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Wed, 25 Mar 2026 10:55:24 +0000 +Subject: [PATCH 15/19] /usr/share/oem -> /oem + +Flatcar previously kept looking at the initrd's /usr/share/oem even +after the migration for compatibility, but the minimal initrd now moves +it to /oem before Ignition starts. + +Signed-off-by: James Le Cuirot +--- + config/util/translate.go | 2 +- + internal/distro/distro.go | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config/util/translate.go b/config/util/translate.go +index 347d148c..d4c057b2 100644 +--- a/config/util/translate.go ++++ b/config/util/translate.go +@@ -154,7 +154,7 @@ func FSGeneration(name string, fsMap map[string]string) (string, error) { + if _, ok := fsMap[name]; !ok { + addedSuffixCounter += 1 + if name == "oem" { +- fsMap[name] = "/usr/share/oem" ++ fsMap[name] = "/oem" + } else { + // generate a new path + fsMap[name] = "/tmp/" + name + "-ign" + strconv.FormatUint(addedSuffixCounter, 10) +diff --git a/internal/distro/distro.go b/internal/distro/distro.go +index 98d0625d..a970ef17 100644 +--- a/internal/distro/distro.go ++++ b/internal/distro/distro.go +@@ -31,7 +31,7 @@ var ( + // initramfs directory containing distro-provided base config + systemConfigDir = "/usr/lib/ignition" + // initramfs directory to check before retrieving file from OEM partition +- oemLookasideDir = "/usr/share/oem" ++ oemLookasideDir = "/oem" + + // Helper programs + groupaddCmd = "groupadd" +-- +2.54.0 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch deleted file mode 100644 index 6085830578b..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a20cefa19baa5e4fd58633af06512a800cad1186 Mon Sep 17 00:00:00 2001 -From: Mathieu Tortuyaux -Date: Mon, 4 Mar 2024 15:05:14 +0100 -Subject: [PATCH 16/20] docs: Add re-added platforms to docs to pass tests - -Signed-off-by: Mathieu Tortuyaux -Co-Authored-By: Krzesimir Nowak Date: Tue, 16 May 2023 17:43:43 +0200 -Subject: [PATCH 18/20] internal/exec/stages/mount: Mount /oem +Subject: [PATCH 16/19] internal/exec/stages/mount: Mount /oem When asking to mount the OEM partition to /usr/share/oem, actually mount it in /oem. The /usr/share/oem is a symlink pointing to /oem, so @@ -12,7 +12,7 @@ into /usr/share/oem, should end up having things in /oem. 1 file changed, 5 insertions(+) diff --git a/internal/exec/stages/mount/mount.go b/internal/exec/stages/mount/mount.go -index 72bd781e..803c40f6 100644 +index bc0bf534..f9f8dcaa 100644 --- a/internal/exec/stages/mount/mount.go +++ b/internal/exec/stages/mount/mount.go @@ -118,6 +118,11 @@ func (s stage) mountFs(fs types.Filesystem) error { @@ -28,5 +28,5 @@ index 72bd781e..803c40f6 100644 if err := checkForNonDirectories(path); err != nil { return err -- -2.53.0 +2.54.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-stages-disks-Fix-handling-of-device-mapper-when-part.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-stages-disks-Fix-handling-of-device-mapper-when-part.patch similarity index 93% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-stages-disks-Fix-handling-of-device-mapper-when-part.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-stages-disks-Fix-handling-of-device-mapper-when-part.patch index 28900e2ea1c..7ddd978959a 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-stages-disks-Fix-handling-of-device-mapper-when-part.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-stages-disks-Fix-handling-of-device-mapper-when-part.patch @@ -1,13 +1,19 @@ -From 1a2908e042ce2fb35cf87890b0cceb25be399383 Mon Sep 17 00:00:00 2001 +From 15178ee5bc94c1e98e51ebf32d2db8d9c671249e Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 11 Jun 2026 23:03:00 +0100 -Subject: [PATCH 19/21] stages/disks: Fix handling of device mapper when +Subject: [PATCH 17/19] stages/disks: Fix handling of device mapper when partitioning It was handled correctly when checking whether the whole disk was in use but not when checking individual partitions. Signed-off-by: James Le Cuirot +--- + internal/exec/stages/disks/partitions.go | 63 +++++++++++++++++++----- + 1 file changed, 50 insertions(+), 13 deletions(-) + +diff --git a/internal/exec/stages/disks/partitions.go b/internal/exec/stages/disks/partitions.go +index c20e4875..f68d6dad 100644 --- a/internal/exec/stages/disks/partitions.go +++ b/internal/exec/stages/disks/partitions.go @@ -323,11 +323,15 @@ func (p PartitionList) Swap(i, j int) { diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-usr-share-oem-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-usr-share-oem-oem.patch deleted file mode 100644 index c1dd8501178..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-usr-share-oem-oem.patch +++ /dev/null @@ -1,60 +0,0 @@ -From bb373e088527744247a6ce3ffec4f08fc0cab721 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot -Date: Wed, 25 Mar 2026 10:55:24 +0000 -Subject: [PATCH 17/20] /usr/share/oem -> /oem - -Flatcar previously kept looking at the initrd's /usr/share/oem even -after the migration for compatibility, but the minimal initrd now moves -it to /oem before Ignition starts. - -Signed-off-by: James Le Cuirot ---- - config/util/translate.go | 2 +- - docs/supported-platforms.md | 4 ++-- - internal/distro/distro.go | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/config/util/translate.go b/config/util/translate.go -index 347d148c..d4c057b2 100644 ---- a/config/util/translate.go -+++ b/config/util/translate.go -@@ -154,7 +154,7 @@ func FSGeneration(name string, fsMap map[string]string) (string, error) { - if _, ok := fsMap[name]; !ok { - addedSuffixCounter += 1 - if name == "oem" { -- fsMap[name] = "/usr/share/oem" -+ fsMap[name] = "/oem" - } else { - // generate a new path - fsMap[name] = "/tmp/" + name + "-ign" + strconv.FormatUint(addedSuffixCounter, 10) -diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md -index e4f4d03b..f4e7338c 100644 ---- a/docs/supported-platforms.md -+++ b/docs/supported-platforms.md -@@ -12,8 +12,8 @@ Ignition is currently supported for the following platforms: - * [Amazon Web Services] (`aws`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately. - * [Microsoft Azure] (`azure`)- Ignition will read its configuration from the custom data provided to the instance. Cloud SSH keys are handled separately. - * [Microsoft Azure Stack] (`azurestack`) - Ignition will read its configuration from the custom data provided to the instance. Cloud SSH keys are handled separately. --* Bare Metal - Use the `ignition.config.url` kernel parameter to provide a URL to the configuration. The URL can use the `http://`, `https://`, `tftp://`, `s3://`, or `gs://` schemes to specify a remote config or the `oem://` scheme to specify a local config, rooted in `/usr/share/oem`. --* PXE - Use the `ignition.config.url` and first boot kernel parameters to provide a URL to the configuration. The URL can use the `http://`, `https://`, `tftp://`, or `s3://` schemes to specify a remote config or the `oem://` scheme to specify a local config, rooted in `/usr/share/oem`. -+* Bare Metal - Use the `ignition.config.url` kernel parameter to provide a URL to the configuration. The URL can use the `http://`, `https://`, `tftp://`, `s3://`, or `gs://` schemes to specify a remote config or the `oem://` scheme to specify a local config, rooted in `/oem`. -+* PXE - Use the `ignition.config.url` and first boot kernel parameters to provide a URL to the configuration. The URL can use the `http://`, `https://`, `tftp://`, or `s3://` schemes to specify a remote config or the `oem://` scheme to specify a local config, rooted in `/oem`. - * [Brightbox] (`brightbox`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately. - * [CloudStack] (`cloudstack`) - Ignition will read its configuration from the instance userdata via either metadata service or config drive. Cloud SSH keys are handled separately. - * `cloudsigma` - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately. -diff --git a/internal/distro/distro.go b/internal/distro/distro.go -index fb12b792..3a6c2ae3 100644 ---- a/internal/distro/distro.go -+++ b/internal/distro/distro.go -@@ -31,7 +31,7 @@ var ( - // initramfs directory containing distro-provided base config - systemConfigDir = "/usr/lib/ignition" - // initramfs directory to check before retrieving file from OEM partition -- oemLookasideDir = "/usr/share/oem" -+ oemLookasideDir = "/oem" - - // Helper programs - groupaddCmd = "groupadd" --- -2.53.0 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-stages-disks-Fix-giving-partition-number-0-to-get-th.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-stages-disks-Fix-giving-partition-number-0-to-get-th.patch similarity index 92% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-stages-disks-Fix-giving-partition-number-0-to-get-th.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-stages-disks-Fix-giving-partition-number-0-to-get-th.patch index e9116dc389d..e13b7dc051e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-stages-disks-Fix-giving-partition-number-0-to-get-th.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-stages-disks-Fix-giving-partition-number-0-to-get-th.patch @@ -1,7 +1,7 @@ -From ec53df4431c91342caeed84e35e590ccd191e593 Mon Sep 17 00:00:00 2001 +From 1fc41c5464381fd487492bf2cb13ab375ca2ed39 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Tue, 2 Jun 2026 15:12:37 +0100 -Subject: [PATCH 20/21] stages/disks: Fix giving partition number 0 to get the +Subject: [PATCH 18/19] stages/disks: Fix giving partition number 0 to get the next available This was broken since partx was used in commit c2cc56cd. Passing 0 to @@ -17,6 +17,12 @@ sgdisk does support --new=0, but it has no way to report which partition number it actually used. Signed-off-by: James Le Cuirot +--- + internal/exec/stages/disks/partitions.go | 64 ++++++++++++++---------- + 1 file changed, 37 insertions(+), 27 deletions(-) + +diff --git a/internal/exec/stages/disks/partitions.go b/internal/exec/stages/disks/partitions.go +index f68d6dad..3b92a461 100644 --- a/internal/exec/stages/disks/partitions.go +++ b/internal/exec/stages/disks/partitions.go @@ -112,15 +112,6 @@ func partitionMatchesCommon(existing util.PartitionInfo, spec sgdisk.Partition) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-stages-disks-Allow-partx-to-fail-then-check-the-stat.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-stages-disks-Allow-partx-to-fail-then-check-the-stat.patch similarity index 93% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-stages-disks-Allow-partx-to-fail-then-check-the-stat.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-stages-disks-Allow-partx-to-fail-then-check-the-stat.patch index 089a31b72fe..b90ad777975 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-stages-disks-Allow-partx-to-fail-then-check-the-stat.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-stages-disks-Allow-partx-to-fail-then-check-the-stat.patch @@ -1,7 +1,7 @@ -From 55f30de3bb7cd9fb8fbea9f2c11d7411744f36b8 Mon Sep 17 00:00:00 2001 +From a7a5457de9039ae7313298a4b1e6756f6b43d5b5 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 8 May 2026 17:58:38 +0100 -Subject: [PATCH 21/21] stages/disks: Allow partx to fail then check the state +Subject: [PATCH 19/19] stages/disks: Allow partx to fail then check the state later `partx --add` will fail if the kernel is already aware of the new @@ -17,24 +17,33 @@ just when partitions on the disk were active. It seems best to run it just in case. Signed-off-by: James Le Cuirot +--- + internal/distro/distro.go | 2 + + internal/exec/stages/disks/partitions.go | 137 +++++++++++++++++++---- + 2 files changed, 115 insertions(+), 24 deletions(-) + +diff --git a/internal/distro/distro.go b/internal/distro/distro.go +index a970ef17..a1b63e14 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go -@@ -36,6 +36,7 @@ var ( - // Helper programs +@@ -37,6 +37,7 @@ var ( groupaddCmd = "groupadd" + groupmodCmd = "groupmod" groupdelCmd = "groupdel" + dmsetupCmd = "dmsetup" mdadmCmd = "mdadm" mountCmd = "mount" partxCmd = "partx" -@@ -94,6 +95,7 @@ func OEMLookasideDir() string { return fromEnv("OEM_LOOKASIDE_DIR", oemLookasi - +@@ -96,6 +97,7 @@ func OEMLookasideDir() string { return fromEnv("OEM_LOOKASIDE_DIR", oemLookasi func GroupaddCmd() string { return groupaddCmd } + func GroupmodCmd() string { return groupmodCmd } func GroupdelCmd() string { return groupdelCmd } +func DmsetupCmd() string { return dmsetupCmd } func MdadmCmd() string { return mdadmCmd } func MountCmd() string { return mountCmd } func PartxCmd() string { return partxCmd } +diff --git a/internal/exec/stages/disks/partitions.go b/internal/exec/stages/disks/partitions.go +index 3b92a461..32573295 100644 --- a/internal/exec/stages/disks/partitions.go +++ b/internal/exec/stages/disks/partitions.go @@ -22,10 +22,12 @@ import ( diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.24.0-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.26.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.24.0-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.26.0.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild index 3c1b8c0d829..22af9903112 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild @@ -19,24 +19,22 @@ else "${FILESDIR}/0001-sed-s-coreos-flatcar.patch" "${FILESDIR}/0002-config-add-ignition-translation.patch" "${FILESDIR}/0003-mod-add-flatcar-ignition-0.36.2.patch" - "${FILESDIR}/0004-config-v3_6-convert-ignition-2.x-to-3.x.patch" + "${FILESDIR}/0004-config-v3_7-convert-ignition-2.x-to-3.x.patch" "${FILESDIR}/0005-vendor-go-mod-vendor.patch" "${FILESDIR}/0006-internal-prv-cmdline-backport-flatcar-patch.patch" "${FILESDIR}/0007-provider-qemu-apply-fw_cfg-patch.patch" - "${FILESDIR}/0008-config-3_6-test-add-ignition-2.x-test-cases.patch" - "${FILESDIR}/0009-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch" - "${FILESDIR}/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch" - "${FILESDIR}/0011-config-version-handle-configuration-version-1.patch" - "${FILESDIR}/0012-config-util-add-cloud-init-detection-to-initial-pars.patch" - "${FILESDIR}/0013-Partially-revert-drop-OEM-URI-support.patch" - "${FILESDIR}/0014-config-Support-oem-schema-in-newer-config-spec-versi.patch" - "${FILESDIR}/0015-translation-support-OEM-and-oem.patch" - "${FILESDIR}/0016-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch" - "${FILESDIR}/0017-usr-share-oem-oem.patch" - "${FILESDIR}/0018-internal-exec-stages-mount-Mount-oem.patch" - "${FILESDIR}/0019-stages-disks-Fix-handling-of-device-mapper-when-part.patch" - "${FILESDIR}/0020-stages-disks-Fix-giving-partition-number-0-to-get-th.patch" - "${FILESDIR}/0021-stages-disks-Allow-partx-to-fail-then-check-the-stat.patch" + "${FILESDIR}/0008-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch" + "${FILESDIR}/0009-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch" + "${FILESDIR}/0010-config-version-handle-configuration-version-1.patch" + "${FILESDIR}/0011-config-util-add-cloud-init-detection-to-initial-pars.patch" + "${FILESDIR}/0012-Partially-revert-drop-OEM-URI-support.patch" + "${FILESDIR}/0013-config-Support-oem-schema-in-newer-config-spec-versi.patch" + "${FILESDIR}/0014-translation-support-OEM-and-oem.patch" + "${FILESDIR}/0015-usr-share-oem-oem.patch" + "${FILESDIR}/0016-internal-exec-stages-mount-Mount-oem.patch" + "${FILESDIR}/0017-stages-disks-Fix-handling-of-device-mapper-when-part.patch" + "${FILESDIR}/0018-stages-disks-Fix-giving-partition-number-0-to-get-th.patch" + "${FILESDIR}/0019-stages-disks-Allow-partx-to-fail-then-check-the-stat.patch" ) fi