diff --git a/changelog/updates/2025-12-03-ignition.md b/changelog/updates/2025-12-03-ignition.md new file mode 100644 index 00000000000..e16424e59c4 --- /dev/null +++ b/changelog/updates/2025-12-03-ignition.md @@ -0,0 +1 @@ +- Ignition ([2.24.0](https://coreos.github.io/ignition/release-notes/#ignition-2240-2024-10-14)) 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 b864dd3ef34..bc82804358f 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.22.0.tar.gz 8262012 BLAKE2B f6406c88a9085dcc2c75a28a31ff9a67377745c55cc909e6e1fd4443f522004bc4a5c3d7c41d317e81b014dea2b96a16cbe4072173b8af7a6db7081b45741d01 SHA512 fd9fbe28b77c0593c4ca3f7d08fcb46c56c29d8fd4365c37856b8ccfd178d3cbb44dbe15effcfada3da851bece893edfe2b4de2c4873a90c909322a8c806143a +DIST ignition-2.24.0.tar.gz 8569157 BLAKE2B ffc97b24ff723955eb1b03cade7ef16bbcc544ef89730895148019d50869c381525398ae4b253976601ce17ad4d7436a844cd1011c2d17b07efa9802a11b1d23 SHA512 45316c9ae10588ab6615e719d3ab8096ac67320d7c046c6777f502637fd05f1b9aecd00dddec352d18cfdd537c0a4f5fb42160b4697deccd401b67a8939fabd3 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 1b8a26993c9..aa8b976067e 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 83334ffac4b77d25c9ef474075170e21241f006a Mon Sep 17 00:00:00 2001 +From fcc27c877309fc610b5de7f049ff831bbc7d2de8 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/` +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 | 16 ++--- config/doc/generate.go | 2 +- config/doc/schema.go | 2 +- config/merge/merge.go | 6 +- @@ -303,25 +303,25 @@ Signed-off-by: Mathieu Tortuyaux go.mod | 2 +- internal/apply/apply.go | 30 +++++----- internal/distro/distro.go | 2 +- - internal/doc/main.go | 16 +++--- + internal/doc/main.go | 16 ++--- internal/exec/config_fetcher.go | 18 +++--- - internal/exec/engine.go | 22 ++++---- - internal/exec/stages/disks/disks.go | 16 +++--- + internal/exec/engine.go | 22 +++---- + internal/exec/stages/disks/disks.go | 16 ++--- internal/exec/stages/disks/filesystems.go | 8 +-- internal/exec/stages/disks/luks.go | 12 ++-- internal/exec/stages/disks/partitions.go | 12 ++-- internal/exec/stages/disks/raid.go | 6 +- internal/exec/stages/fetch/fetch.go | 12 ++-- - .../stages/fetch_offline/fetch-offline.go | 16 +++--- + .../stages/fetch_offline/fetch-offline.go | 16 ++--- .../fetch_offline/fetch_offline_test.go | 4 +- internal/exec/stages/files/files.go | 14 ++--- 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 | 12 ++-- + internal/exec/stages/files/units.go | 10 ++-- internal/exec/stages/files/units_test.go | 4 +- internal/exec/stages/kargs/kargs.go | 14 ++--- - internal/exec/stages/mount/mount.go | 16 +++--- + internal/exec/stages/mount/mount.go | 16 ++--- internal/exec/stages/stages.go | 10 ++-- internal/exec/stages/umount/umount.go | 14 ++--- internal/exec/util/blkid.go | 2 +- @@ -337,9 +337,9 @@ Signed-off-by: Mathieu Tortuyaux internal/providers/aliyun/aliyun.go | 8 +-- internal/providers/applehv/applehv.go | 10 ++-- internal/providers/aws/aws.go | 12 ++-- - internal/providers/azure/azure.go | 16 +++--- + internal/providers/azure/azure.go | 16 ++--- internal/providers/azurestack/azurestack.go | 8 +-- - internal/providers/cloudstack/cloudstack.go | 16 +++--- + internal/providers/cloudstack/cloudstack.go | 16 ++--- internal/providers/cmdline/cmdline.go | 12 ++-- .../providers/digitalocean/digitalocean.go | 8 +-- internal/providers/exoscale/exoscale.go | 8 +-- @@ -351,7 +351,7 @@ Signed-off-by: Mathieu Tortuyaux internal/providers/kubevirt/kubevirt.go | 14 ++--- internal/providers/metal/metal.go | 8 +-- internal/providers/nutanix/nutanix.go | 14 ++--- - internal/providers/openstack/openstack.go | 16 +++--- + internal/providers/openstack/openstack.go | 16 ++--- internal/providers/oraclecloud/oraclecloud.go | 8 +-- internal/providers/packet/packet.go | 8 +-- internal/providers/powervs/powervs.go | 14 ++--- @@ -360,6 +360,7 @@ Signed-off-by: Mathieu Tortuyaux internal/providers/qemu/qemu_fwcfg.go | 10 ++-- internal/providers/scaleway/scaleway.go | 8 +-- internal/providers/system/system.go | 14 ++--- + internal/providers/upcloud/upcloud.go | 8 +-- internal/providers/util/config.go | 6 +- internal/providers/util/file.go | 4 +- internal/providers/util/unzip_test.go | 2 +- @@ -368,7 +369,7 @@ 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 | 56 +++++++++---------- + internal/register/providers.go | 58 +++++++++---------- internal/register/stages.go | 14 ++--- internal/resource/http.go | 12 ++-- internal/resource/url.go | 6 +- @@ -425,12 +426,12 @@ 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 | 16 ++--- tests/registry/registry.go | 40 ++++++------- tests/servers/servers.go | 2 +- tests/validator.go | 4 +- validate/main.go | 4 +- - 425 files changed, 1134 insertions(+), 1134 deletions(-) + 426 files changed, 1138 insertions(+), 1138 deletions(-) diff --git a/config/config.go b/config/config.go index 47e82214..0cbdb15d 100644 @@ -3451,11 +3452,11 @@ index 3dc90540..8c96dfba 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_4/types/url.go b/config/v3_4/types/url.go -index 3ca189da..9b2b4405 100644 +index 97a4c9ae..b1f96337 100644 --- a/config/v3_4/types/url.go +++ b/config/v3_4/types/url.go @@ -21,8 +21,8 @@ import ( - "github.com/aws/aws-sdk-go/aws/arn" + "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/vincent-petithory/dataurl" - "github.com/coreos/ignition/v2/config/shared/errors" @@ -4122,11 +4123,11 @@ index 3dc90540..8c96dfba 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_5/types/url.go b/config/v3_5/types/url.go -index 3ca189da..9b2b4405 100644 +index 97a4c9ae..b1f96337 100644 --- a/config/v3_5/types/url.go +++ b/config/v3_5/types/url.go @@ -21,8 +21,8 @@ import ( - "github.com/aws/aws-sdk-go/aws/arn" + "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/vincent-petithory/dataurl" - "github.com/coreos/ignition/v2/config/shared/errors" @@ -4795,11 +4796,11 @@ 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 -index 3ca189da..9b2b4405 100644 +index 97a4c9ae..b1f96337 100644 --- a/config/v3_6_experimental/types/url.go +++ b/config/v3_6_experimental/types/url.go @@ -21,8 +21,8 @@ import ( - "github.com/aws/aws-sdk-go/aws/arn" + "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/vincent-petithory/dataurl" - "github.com/coreos/ignition/v2/config/shared/errors" @@ -4851,7 +4852,7 @@ index 9a0914d0..f121b503 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/validate/validate.go b/config/validate/validate.go -index 613c21e4..a8f41517 100644 +index 56ffcd0a..a1a55d0d 100644 --- a/config/validate/validate.go +++ b/config/validate/validate.go @@ -18,8 +18,8 @@ import ( @@ -4866,7 +4867,7 @@ index 613c21e4..a8f41517 100644 "github.com/coreos/vcontext/json" "github.com/coreos/vcontext/path" diff --git a/config/validate/validate_test.go b/config/validate/validate_test.go -index 18eea933..4f77f19c 100644 +index 820a7f07..0f359f5b 100644 --- a/config/validate/validate_test.go +++ b/config/validate/validate_test.go @@ -20,7 +20,7 @@ import ( @@ -4879,14 +4880,14 @@ index 18eea933..4f77f19c 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/go.mod b/go.mod -index c4aca58f..a34e8f5e 100644 +index 15869b4e..ab37e13c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/coreos/ignition/v2 +module github.com/flatcar/ignition/v2 - go 1.23.0 + go 1.24.0 diff --git a/internal/apply/apply.go b/internal/apply/apply.go index db48b8dc..b98fdf5d 100644 @@ -4930,7 +4931,7 @@ index db48b8dc..b98fdf5d 100644 type Flags struct { diff --git a/internal/distro/distro.go b/internal/distro/distro.go -index e5254649..eb4c3179 100644 +index cd90d189..9d9351e7 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go @@ -20,7 +20,7 @@ import ( @@ -4943,7 +4944,7 @@ index e5254649..eb4c3179 100644 // Device node directories and paths diskByLabelDir = "/dev/disk/by-label" diff --git a/internal/doc/main.go b/internal/doc/main.go -index 8e1dc6ba..2a66ba3a 100644 +index 6cee7a70..518d4bee 100644 --- a/internal/doc/main.go +++ b/internal/doc/main.go @@ -25,14 +25,14 @@ import ( @@ -4999,7 +5000,7 @@ index 0769d983..3067037f 100644 type ConfigFetcher struct { diff --git a/internal/exec/engine.go b/internal/exec/engine.go -index f584e518..dcadb091 100644 +index c2e61f7e..2570fc88 100644 --- a/internal/exec/engine.go +++ b/internal/exec/engine.go @@ -23,17 +23,17 @@ import ( @@ -5032,7 +5033,7 @@ index f584e518..dcadb091 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 68f8c77c..c0875140 100644 +index 2d06aaf3..eae124dd 100644 --- a/internal/exec/stages/disks/disks.go +++ b/internal/exec/stages/disks/disks.go @@ -25,14 +25,14 @@ import ( @@ -5059,7 +5060,7 @@ index 68f8c77c..c0875140 100644 const ( diff --git a/internal/exec/stages/disks/filesystems.go b/internal/exec/stages/disks/filesystems.go -index 0938d985..c575ced4 100644 +index a915ca57..a12c59d7 100644 --- a/internal/exec/stages/disks/filesystems.go +++ b/internal/exec/stages/disks/filesystems.go @@ -25,10 +25,10 @@ import ( @@ -5078,7 +5079,7 @@ index 0938d985..c575ced4 100644 var ( diff --git a/internal/exec/stages/disks/luks.go b/internal/exec/stages/disks/luks.go -index 680ab0be..fe03a907 100644 +index 9dfe9ea3..bffa67ba 100644 --- a/internal/exec/stages/disks/luks.go +++ b/internal/exec/stages/disks/luks.go @@ -29,12 +29,12 @@ import ( @@ -5101,7 +5102,7 @@ index 680ab0be..fe03a907 100644 "github.com/vincent-petithory/dataurl" ) diff --git a/internal/exec/stages/disks/partitions.go b/internal/exec/stages/disks/partitions.go -index 801485a4..c91c7a61 100644 +index 6285fd5c..dd6acdac 100644 --- a/internal/exec/stages/disks/partitions.go +++ b/internal/exec/stages/disks/partitions.go @@ -30,12 +30,12 @@ import ( @@ -5124,7 +5125,7 @@ index 801485a4..c91c7a61 100644 var ( diff --git a/internal/exec/stages/disks/raid.go b/internal/exec/stages/disks/raid.go -index e02132ee..604b39a3 100644 +index d46efd82..d2abe537 100644 --- a/internal/exec/stages/disks/raid.go +++ b/internal/exec/stages/disks/raid.go @@ -24,9 +24,9 @@ import ( @@ -5141,7 +5142,7 @@ index e02132ee..604b39a3 100644 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 dca8a53b..9a7d7be0 100644 +index ce50c360..93cdbfcc 100644 --- a/internal/exec/stages/fetch/fetch.go +++ b/internal/exec/stages/fetch/fetch.go @@ -19,12 +19,12 @@ @@ -5206,7 +5207,7 @@ index 04237ecb..30c77f4a 100644 "github.com/stretchr/testify/assert" ) diff --git a/internal/exec/stages/files/files.go b/internal/exec/stages/files/files.go -index d448225b..51ec2d6b 100644 +index d2f86bc8..ddbdbac2 100644 --- a/internal/exec/stages/files/files.go +++ b/internal/exec/stages/files/files.go @@ -20,13 +20,13 @@ import ( @@ -5231,7 +5232,7 @@ index d448225b..51ec2d6b 100644 const ( diff --git a/internal/exec/stages/files/files_test.go b/internal/exec/stages/files/files_test.go -index 8335cfea..20d98395 100644 +index 8555be1c..a0c7275b 100644 --- a/internal/exec/stages/files/files_test.go +++ b/internal/exec/stages/files/files_test.go @@ -19,8 +19,8 @@ import ( @@ -5246,7 +5247,7 @@ index 8335cfea..20d98395 100644 func TestEntrySort(t *testing.T) { diff --git a/internal/exec/stages/files/filesystemEntries.go b/internal/exec/stages/files/filesystemEntries.go -index 4cceba71..7d6694b6 100644 +index e977b10e..8320349d 100644 --- a/internal/exec/stages/files/filesystemEntries.go +++ b/internal/exec/stages/files/filesystemEntries.go @@ -24,11 +24,11 @@ import ( @@ -5276,7 +5277,7 @@ index 4cceba71..7d6694b6 100644 return entries, nil diff --git a/internal/exec/stages/files/passwd.go b/internal/exec/stages/files/passwd.go -index c6099406..82072dc8 100644 +index fa3ffd7d..7d1472b7 100644 --- a/internal/exec/stages/files/passwd.go +++ b/internal/exec/stages/files/passwd.go @@ -18,8 +18,8 @@ import ( @@ -5291,7 +5292,7 @@ index c6099406..82072dc8 100644 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 de89a573..22c84a2c 100644 +index 097452bf..b8f46f85 100644 --- a/internal/exec/stages/files/units.go +++ b/internal/exec/stages/files/units.go @@ -21,11 +21,11 @@ import ( @@ -5311,15 +5312,6 @@ index de89a573..22c84a2c 100644 ) // Preset holds the information about -@@ -45,7 +45,7 @@ func (s *stage) warnOnOldSystemdVersion() error { - return err - } - if systemdVersion < 240 { -- s.Logger.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.Logger.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 --- a/internal/exec/stages/files/units_test.go @@ -5336,7 +5328,7 @@ index 96f53888..3bb96d78 100644 func TestParseInstanceUnit(t *testing.T) { diff --git a/internal/exec/stages/kargs/kargs.go b/internal/exec/stages/kargs/kargs.go -index 7c223d2c..5306b9c5 100644 +index 57c709dd..837becd7 100644 --- a/internal/exec/stages/kargs/kargs.go +++ b/internal/exec/stages/kargs/kargs.go @@ -19,13 +19,13 @@ import ( @@ -5361,7 +5353,7 @@ index 7c223d2c..5306b9c5 100644 const ( diff --git a/internal/exec/stages/mount/mount.go b/internal/exec/stages/mount/mount.go -index be2a98c0..bace4bbd 100644 +index 11492e0a..72bd781e 100644 --- a/internal/exec/stages/mount/mount.go +++ b/internal/exec/stages/mount/mount.go @@ -27,14 +27,14 @@ import ( @@ -5409,7 +5401,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 4c4c8cf5..979aa40b 100644 +index e167a178..8b425859 100644 --- a/internal/exec/stages/umount/umount.go +++ b/internal/exec/stages/umount/umount.go @@ -22,13 +22,13 @@ import ( @@ -5447,7 +5439,7 @@ index 9574cb33..6d5e2621 100644 const ( diff --git a/internal/exec/util/file.go b/internal/exec/util/file.go -index f944acfe..d3942741 100644 +index 1fb9fbbb..d7a78767 100644 --- a/internal/exec/util/file.go +++ b/internal/exec/util/file.go @@ -26,11 +26,11 @@ import ( @@ -5468,7 +5460,7 @@ index f944acfe..d3942741 100644 "golang.org/x/sys/unix" ) diff --git a/internal/exec/util/passwd.go b/internal/exec/util/passwd.go -index 776b3fa2..6c8c52e5 100644 +index edd91a83..3b39d4e7 100644 --- a/internal/exec/util/passwd.go +++ b/internal/exec/util/passwd.go @@ -24,10 +24,10 @@ import ( @@ -5487,7 +5479,7 @@ index 776b3fa2..6c8c52e5 100644 ) diff --git a/internal/exec/util/selinux.go b/internal/exec/util/selinux.go -index a274eae6..0bd57f98 100644 +index 79e8f5f1..70c1cb7b 100644 --- a/internal/exec/util/selinux.go +++ b/internal/exec/util/selinux.go @@ -21,7 +21,7 @@ import ( @@ -5500,7 +5492,7 @@ index a274eae6..0bd57f98 100644 const ( diff --git a/internal/exec/util/unit.go b/internal/exec/util/unit.go -index f0d2267c..f13351af 100644 +index e945db66..32d12b28 100644 --- a/internal/exec/util/unit.go +++ b/internal/exec/util/unit.go @@ -22,8 +22,8 @@ import ( @@ -5515,7 +5507,7 @@ index f0d2267c..f13351af 100644 "github.com/vincent-petithory/dataurl" ) diff --git a/internal/exec/util/user_group_lookup_test.go b/internal/exec/util/user_group_lookup_test.go -index 2482d710..8893157a 100644 +index 9c214f29..73f147df 100644 --- a/internal/exec/util/user_group_lookup_test.go +++ b/internal/exec/util/user_group_lookup_test.go @@ -20,7 +20,7 @@ import ( @@ -5545,7 +5537,7 @@ index 7e880e3b..f1865474 100644 // Util encapsulates logging and destdir indirection for the util methods. diff --git a/internal/main.go b/internal/main.go -index 7e9e64c6..fa945f1b 100644 +index 4d636a39..20f57845 100644 --- a/internal/main.go +++ b/internal/main.go @@ -22,15 +22,15 @@ import ( @@ -5654,12 +5646,12 @@ index 2fffec9c..f4117b1a 100644 "github.com/mdlayher/vsock" ) diff --git a/internal/providers/aws/aws.go b/internal/providers/aws/aws.go -index daabc367..b4cb36a1 100644 +index 742005ed..247e3be0 100644 --- a/internal/providers/aws/aws.go +++ b/internal/providers/aws/aws.go -@@ -22,11 +22,11 @@ import ( - "net/http" +@@ -24,11 +24,11 @@ import ( "net/url" + "time" - "github.com/coreos/ignition/v2/config/v3_6_experimental/types" - "github.com/coreos/ignition/v2/internal/log" @@ -5672,9 +5664,9 @@ index daabc367..b4cb36a1 100644 + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds" -@@ -98,7 +98,7 @@ func doInit(f *resource.Fetcher) error { + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/credentials/ec2rolecreds" +@@ -94,7 +94,7 @@ func doInit(f *resource.Fetcher) error { // every stage) but that would risk premature timeouts if the // network takes a while to come up. // @@ -5684,7 +5676,7 @@ index daabc367..b4cb36a1 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 c947c3de..b426332d 100644 +index 09de9591..0d1d1767 100644 --- a/internal/providers/azure/azure.go +++ b/internal/providers/azure/azure.go @@ -26,13 +26,13 @@ import ( @@ -5737,7 +5729,7 @@ index 5468bad3..69152d86 100644 ) diff --git a/internal/providers/cloudstack/cloudstack.go b/internal/providers/cloudstack/cloudstack.go -index 4e75ac1f..e5872f0c 100644 +index f91fea82..e4657505 100644 --- a/internal/providers/cloudstack/cloudstack.go +++ b/internal/providers/cloudstack/cloudstack.go @@ -30,13 +30,13 @@ import ( @@ -5912,10 +5904,10 @@ index 8162e506..f0bb3e9b 100644 ) diff --git a/internal/providers/ibmcloud/ibmcloud.go b/internal/providers/ibmcloud/ibmcloud.go -index 938ca603..ee9f73c4 100644 +index df43ba98..c3e877dc 100644 --- a/internal/providers/ibmcloud/ibmcloud.go +++ b/internal/providers/ibmcloud/ibmcloud.go -@@ -27,13 +27,13 @@ import ( +@@ -26,13 +26,13 @@ import ( "path/filepath" "time" @@ -5937,11 +5929,11 @@ index 938ca603..ee9f73c4 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/kubevirt/kubevirt.go b/internal/providers/kubevirt/kubevirt.go -index 1d43e708..f56f8962 100644 +index d3a19fbc..bae57323 100644 --- a/internal/providers/kubevirt/kubevirt.go +++ b/internal/providers/kubevirt/kubevirt.go -@@ -25,13 +25,13 @@ import ( - "path/filepath" +@@ -27,13 +27,13 @@ import ( + "sync" "time" - "github.com/coreos/ignition/v2/config/v3_6_experimental/types" @@ -5981,7 +5973,7 @@ index 1870cbdb..27c923d4 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/nutanix/nutanix.go b/internal/providers/nutanix/nutanix.go -index dc99e607..ed64b8fb 100644 +index 75fc8f7f..be64c83e 100644 --- a/internal/providers/nutanix/nutanix.go +++ b/internal/providers/nutanix/nutanix.go @@ -25,13 +25,13 @@ import ( @@ -6006,7 +5998,7 @@ index dc99e607..ed64b8fb 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/openstack/openstack.go b/internal/providers/openstack/openstack.go -index 3578256e..3377b448 100644 +index 836845d1..1f591713 100644 --- a/internal/providers/openstack/openstack.go +++ b/internal/providers/openstack/openstack.go @@ -28,13 +28,13 @@ import ( @@ -6040,7 +6032,7 @@ index 3578256e..3377b448 100644 return types.Config{}, report.Report{}, resource.ErrNeedNet } diff --git a/internal/providers/oraclecloud/oraclecloud.go b/internal/providers/oraclecloud/oraclecloud.go -index 33db95c3..65663418 100644 +index fb06caf5..9ef71e47 100644 --- a/internal/providers/oraclecloud/oraclecloud.go +++ b/internal/providers/oraclecloud/oraclecloud.go @@ -24,10 +24,10 @@ import ( @@ -6059,7 +6051,7 @@ index 33db95c3..65663418 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/packet/packet.go b/internal/providers/packet/packet.go -index a1bb5d14..45c55964 100644 +index e497b659..29fa6815 100644 --- a/internal/providers/packet/packet.go +++ b/internal/providers/packet/packet.go @@ -25,10 +25,10 @@ import ( @@ -6078,7 +6070,7 @@ index a1bb5d14..45c55964 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/powervs/powervs.go b/internal/providers/powervs/powervs.go -index 713f823e..a4ef1c25 100644 +index 0d8a4052..a4372f6e 100644 --- a/internal/providers/powervs/powervs.go +++ b/internal/providers/powervs/powervs.go @@ -24,13 +24,13 @@ import ( @@ -6103,7 +6095,7 @@ index 713f823e..a4ef1c25 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/proxmoxve/proxmoxve.go b/internal/providers/proxmoxve/proxmoxve.go -index 5a00420a..dbe6cd98 100644 +index 37b715a2..68389998 100644 --- a/internal/providers/proxmoxve/proxmoxve.go +++ b/internal/providers/proxmoxve/proxmoxve.go @@ -28,13 +28,13 @@ import ( @@ -6151,7 +6143,7 @@ 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 8357671a..389ec119 100644 +index 7dc56fba..863c9601 100644 --- a/internal/providers/qemu/qemu_fwcfg.go +++ b/internal/providers/qemu/qemu_fwcfg.go @@ -29,11 +29,11 @@ import ( @@ -6211,6 +6203,25 @@ index b676e683..cdf39841 100644 + "github.com/flatcar/ignition/v2/internal/log" + "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/upcloud/upcloud.go b/internal/providers/upcloud/upcloud.go +index bec73a7b..0e206d95 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/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/internal/platform" ++ "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" @@ -6337,7 +6348,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 48e95ab7..622ced66 100644 +index 7f57fb54..729a312c 100644 --- a/internal/providers/zvm/zvm.go +++ b/internal/providers/zvm/zvm.go @@ -24,13 +24,13 @@ import ( @@ -6362,10 +6373,10 @@ index 48e95ab7..622ced66 100644 ) diff --git a/internal/register/providers.go b/internal/register/providers.go -index a7348498..834809ba 100644 +index 0e337358..7c7ae52b 100644 --- a/internal/register/providers.go +++ b/internal/register/providers.go -@@ -15,32 +15,32 @@ +@@ -15,33 +15,33 @@ package register import ( @@ -6393,6 +6404,7 @@ index a7348498..834809ba 100644 - _ "github.com/coreos/ignition/v2/internal/providers/proxmoxve" - _ "github.com/coreos/ignition/v2/internal/providers/qemu" - _ "github.com/coreos/ignition/v2/internal/providers/scaleway" +- _ "github.com/coreos/ignition/v2/internal/providers/upcloud" - _ "github.com/coreos/ignition/v2/internal/providers/virtualbox" - _ "github.com/coreos/ignition/v2/internal/providers/vmware" - _ "github.com/coreos/ignition/v2/internal/providers/vultr" @@ -6421,6 +6433,7 @@ index a7348498..834809ba 100644 + _ "github.com/flatcar/ignition/v2/internal/providers/proxmoxve" + _ "github.com/flatcar/ignition/v2/internal/providers/qemu" + _ "github.com/flatcar/ignition/v2/internal/providers/scaleway" ++ _ "github.com/flatcar/ignition/v2/internal/providers/upcloud" + _ "github.com/flatcar/ignition/v2/internal/providers/virtualbox" + _ "github.com/flatcar/ignition/v2/internal/providers/vmware" + _ "github.com/flatcar/ignition/v2/internal/providers/vultr" @@ -6450,7 +6463,7 @@ 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 b6e90988..9a37ffac 100644 +index 197f5731..05463dd7 100644 --- a/internal/resource/http.go +++ b/internal/resource/http.go @@ -28,12 +28,12 @@ import ( @@ -6473,7 +6486,7 @@ index b6e90988..9a37ffac 100644 "github.com/vincent-petithory/dataurl" diff --git a/internal/resource/url.go b/internal/resource/url.go -index 4d7a895d..354385fa 100644 +index 0a35f995..5f08f059 100644 --- a/internal/resource/url.go +++ b/internal/resource/url.go @@ -33,9 +33,9 @@ import ( @@ -6507,7 +6520,7 @@ index ed1c2d6a..41c0e354 100644 func TestDataUrl(t *testing.T) { diff --git a/internal/sgdisk/sgdisk.go b/internal/sgdisk/sgdisk.go -index a4ade134..9904225e 100644 +index 1b276704..fa96bf15 100644 --- a/internal/sgdisk/sgdisk.go +++ b/internal/sgdisk/sgdisk.go @@ -19,10 +19,10 @@ import ( @@ -6539,7 +6552,7 @@ index 30fb3873..e12cd726 100644 type State struct { diff --git a/internal/util/tools/docs/docs.go b/internal/util/tools/docs/docs.go -index ca65069a..41ebf464 100644 +index 11731ada..8d516fca 100644 --- a/internal/util/tools/docs/docs.go +++ b/internal/util/tools/docs/docs.go @@ -24,7 +24,7 @@ import ( @@ -6578,7 +6591,7 @@ index e4ad12ee..122934f1 100644 func TestAssertValid(t *testing.T) { diff --git a/tests/blackbox_test.go b/tests/blackbox_test.go -index aa3d50f7..d7bcd26e 100644 +index 5bcb4da8..8c9ec843 100644 --- a/tests/blackbox_test.go +++ b/tests/blackbox_test.go @@ -26,14 +26,14 @@ import ( @@ -6603,10 +6616,10 @@ index aa3d50f7..d7bcd26e 100644 // UUID generation tool "github.com/google/uuid" diff --git a/tests/filesystem.go b/tests/filesystem.go -index 2d9c676b..79797e23 100644 +index 76b389b3..ed9789c5 100644 --- a/tests/filesystem.go +++ b/tests/filesystem.go -@@ -30,8 +30,8 @@ import ( +@@ -31,8 +31,8 @@ import ( "strings" "testing" @@ -6845,7 +6858,7 @@ index 83149e89..1c4d59ac 100644 func init() { diff --git a/tests/negative/timeouts/timeouts.go b/tests/negative/timeouts/timeouts.go -index 5ac0967b..b3bfd02e 100644 +index b89f33f7..e6997c5a 100644 --- a/tests/negative/timeouts/timeouts.go +++ b/tests/negative/timeouts/timeouts.go @@ -20,8 +20,8 @@ import ( @@ -6899,7 +6912,7 @@ index d99944a0..6998d346 100644 in := types.GetBaseDisk() out := types.GetBaseDisk() diff --git a/tests/positive/files/hash.go b/tests/positive/files/hash.go -index 8faecff7..829b15e7 100644 +index 3e1f4904..a43aa982 100644 --- a/tests/positive/files/hash.go +++ b/tests/positive/files/hash.go @@ -17,9 +17,9 @@ package files @@ -6940,7 +6953,7 @@ index 72dd1b1f..ea21f539 100644 name := "links.hard.deep.create.file" in := types.GetBaseDisk() diff --git a/tests/positive/files/remote.go b/tests/positive/files/remote.go -index d1a8244e..792bdae7 100644 +index e3b5e03c..b325e31e 100644 --- a/tests/positive/files/remote.go +++ b/tests/positive/files/remote.go @@ -17,9 +17,9 @@ package files @@ -7416,7 +7429,7 @@ index 0230cd16..a4d235a2 100644 ) diff --git a/tests/validator.go b/tests/validator.go -index d407a695..7321f9dd 100644 +index 9e837357..6fa1e6c7 100644 --- a/tests/validator.go +++ b/tests/validator.go @@ -25,8 +25,8 @@ import ( @@ -7431,7 +7444,7 @@ index d407a695..7321f9dd 100644 "golang.org/x/sys/unix" ) diff --git a/validate/main.go b/validate/main.go -index bec64866..ed027604 100644 +index f32eb29b..390f5ef8 100644 --- a/validate/main.go +++ b/validate/main.go @@ -21,8 +21,8 @@ import ( @@ -7446,5 +7459,5 @@ index bec64866..ed027604 100644 var ( -- -2.49.1 +2.51.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 e22b82e1f9d..ce351a9f61a 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 a06550ff7294cde7367802b22f45b147a11d0324 Mon Sep 17 00:00:00 2001 +From f1324cc831035f3bf9ac0001192694537ac40608 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.49.1 +2.51.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 51cd894c421..b54a944039c 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,47 +1,188 @@ -From ee56f2df58941892c102869290a52450f9727f83 Mon Sep 17 00:00:00 2001 +From f5cbc16ad212778818865571136936c07079da51 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 +Subject: [PATCH 03/19] mod: add flatcar/ignition@0.36.2 it's required for Ignition conversion. Signed-off-by: Mathieu Tortuyaux --- - go.mod | 4 ++++ - 1 file changed, 4 insertions(+) + go.mod | 4 ++++ + go.sum | 36 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 40 insertions(+) diff --git a/go.mod b/go.mod -index a34e8f5e..be20c337 100644 +index ab37e13c..8df40512 100644 --- a/go.mod +++ b/go.mod -@@ -15,6 +15,7 @@ require ( +@@ -19,6 +19,7 @@ require ( github.com/coreos/go-semver v0.3.1 - github.com/coreos/go-systemd/v22 v22.5.0 + 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/uuid v1.6.0 github.com/mdlayher/vsock v1.2.1 -@@ -44,9 +45,11 @@ require ( - github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect +@@ -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/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 +@@ -60,6 +62,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect + github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // 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.1 // 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/protoc-gen-validate v1.2.1 // indirect -@@ -77,6 +80,7 @@ require ( - go.opentelemetry.io/otel/sdk v1.36.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect - go.opentelemetry.io/otel/trace v1.36.0 // 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 + go4.org v0.0.0-20160314031811-03efcb870d84 // indirect - golang.org/x/crypto v0.39.0 // indirect - golang.org/x/sync v0.15.0 // indirect - golang.org/x/text v0.26.0 // 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 +diff --git a/go.sum b/go.sum +index 217fbf7c..9f997768 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/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/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= ++github.com/coreos/go-semver v0.1.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= + github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= + github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= ++github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 h1:3jFq2xL4ZajGK4aZY8jz+DAF0FHjI51BXjjSwCzS1Dk= ++github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= + github.com/coreos/go-systemd/v22 v22.6.0 h1:aGVa/v8B7hpb0TKl0MWoAavPDmHvobFe5R5zn0bCJWo= + github.com/coreos/go-systemd/v22 v22.6.0/go.mod h1:iG+pp635Fo7ZmV/j14KUcmEyWF+0X7Lua8rrTWzYgWU= + github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 h1:uSmlDgJGbUB0bwQBcZomBTottKwEDF5fF8UjSwKSzWM= + github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687/go.mod h1:Salmysdw7DAVuobBW/LwsKKgpyCPHUhjyJoMJD+ZJiI= ++github.com/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/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-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= + 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= ++github.com/godbus/dbus v0.0.0-20181025153459-66d97aec3384/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= + 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= ++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 + 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= ++github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= + github.com/pin/tftp v2.1.0+incompatible h1:Yng4J7jv6lOc6IF4XoB5mnd3P7ZrF60XQq+my3FAMus= + github.com/pin/tftp v2.1.0+incompatible/go.mod h1:xVpZOMCXTy+A5QMjEVN0Glwa1sUvaJhFXbr/aAxuxGY= + github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= + github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= + github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo= + github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= ++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/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/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= + github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= + github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8AbShPRpg2CI= + github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U= ++github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod h1:x9oS4Wk2s2u4tS29nEaDLdzvuHdB19CvSGJjPgkZJNk= + 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= ++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/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/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/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/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 + 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= ++gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= ++gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= + gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= + gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -- -2.49.1 +2.51.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-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_6-convert-ignition-2.x-to-3.x.patch similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-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_6-convert-ignition-2.x-to-3.x.patch index 0ebd30af11a..739458d3bd9 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-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_6-convert-ignition-2.x-to-3.x.patch @@ -1,7 +1,7 @@ -From 1c451c17c202fa1a27888bfe76d192e077d13ab8 Mon Sep 17 00:00:00 2001 +From 60e42b49e60202310a0fd38c468191eaba9fca28 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 24 Oct 2024 10:20:45 +0200 -Subject: [PATCH 06/20] config/v3_6: convert ignition 2.x to 3.x +Subject: [PATCH 04/19] config/v3_6: convert ignition 2.x to 3.x if the version of ignition is 2.x we convert it to 3.x using ign-converter. @@ -72,5 +72,5 @@ index 3be26cae..ea367663 100644 return Parse(raw) } -- -2.49.1 +2.51.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch deleted file mode 100644 index 38c98896171..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch +++ /dev/null @@ -1,147 +0,0 @@ -From a407a17d3b18ac22dc17dd2f46f9023be93fda3c Mon Sep 17 00:00:00 2001 -From: Mathieu Tortuyaux -Date: Tue, 12 Aug 2025 15:10:32 +0200 -Subject: [PATCH 04/20] sum: go mod tidy - -Signed-off-by: Mathieu Tortuyaux ---- - go.sum | 35 ++++++++++++++++++++++++++++++++++- - 1 file changed, 34 insertions(+), 1 deletion(-) - -diff --git a/go.sum b/go.sum -index 0321edfb..ad66930d 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.51.0/go.mod h1:SZiPHWGOOk3bl8tkevxkoiwPgsIl6CwrWcbwjfHZpdM= - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 h1:6/0iUd0xrnX7qt+mLNRwg5c0PGv8wpE8K90ryANQwMI= - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0/go.mod h1:otE2jQekW/PqXk1Awf5lmfokJx4uwuqcj1ab5SpGeW0= -+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 v1.55.7 h1:UJrkFq7es5CShfBwlWAC8DA077vp8PyVbQd3lqLiztE= - github.com/aws/aws-sdk-go v1.55.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= - github.com/beevik/etree v1.5.1 h1:TC3zyxYp+81wAmbsi8SWUpZCurbxa6S8RITYRSkNRwo= -@@ -56,8 +59,11 @@ 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= -+github.com/coreos/go-semver v0.1.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= - github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= - github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= -+github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 h1:3jFq2xL4ZajGK4aZY8jz+DAF0FHjI51BXjjSwCzS1Dk= -+github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= - github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= - github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= - github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 h1:uSmlDgJGbUB0bwQBcZomBTottKwEDF5fF8UjSwKSzWM= -@@ -77,6 +83,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.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE= - github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA= - github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -@@ -84,6 +93,7 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= - github.com/go-logr/logr v1.4.2/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= -+github.com/godbus/dbus v0.0.0-20181025153459-66d97aec3384/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= - github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA= - github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= - github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= -@@ -104,10 +114,13 @@ 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.14.2 h1:eBLnkZ9635krYIPD+ag1USrOAI0Nr0QYF3+/3GqO0k0= - github.com/googleapis/gax-go/v2 v2.14.2/go.mod h1:ON64QhlJkhVtSqp4v1uaK92VyZ2gmvDQsweuyLV+8+w= -+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/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= - github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= - github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= - github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -+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= -@@ -124,6 +137,7 @@ 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= -+github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= - github.com/pin/tftp v2.1.0+incompatible h1:Yng4J7jv6lOc6IF4XoB5mnd3P7ZrF60XQq+my3FAMus= - github.com/pin/tftp v2.1.0+incompatible/go.mod h1:xVpZOMCXTy+A5QMjEVN0Glwa1sUvaJhFXbr/aAxuxGY= - github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= -@@ -136,17 +150,24 @@ github.com/redis/go-redis/v9 v9.8.0 h1:q3nRvjrlge/6UD7eTu/DSg2uYiU2mCL0G/uzBWqhi - github.com/redis/go-redis/v9 v9.8.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw= - 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/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.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= - github.com/spf13/pflag v1.0.6/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/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.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= - github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= - github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8AbShPRpg2CI= - github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U= -+github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod h1:x9oS4Wk2s2u4tS29nEaDLdzvuHdB19CvSGJjPgkZJNk= - 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= -@@ -169,21 +190,31 @@ go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFw - go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4= - go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w= - go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA= -+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.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM= - golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U= -+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.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= - golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= - golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= - golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= - golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8= - golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= -+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.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= - golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -+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.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= - golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= - golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= - golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= -+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= - google.golang.org/api v0.236.0 h1:CAiEiDVtO4D/Qja2IA9VzlFrgPnK3XVMmRoJZlSWbc0= - google.golang.org/api v0.236.0/go.mod h1:X1WF9CU2oTc+Jml1tiIxGmWFK/UZezdqEu09gcxZAj4= - google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 h1:1tXaIXCracvtsRxSBsYDiSBN0cuJvM7QYW+MrpIRY78= -@@ -199,7 +230,9 @@ google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/ - 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= --gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= - gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= - gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= - gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= --- -2.49.1 - 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 92aa7ae83b8..2a00303f635 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 c2f572be6f33034b1f810fd463a42d11e71e7168 Mon Sep 17 00:00:00 2001 +From a063a1dc15568f90e3192ae1250d2aee6677d103 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 +Subject: [PATCH 05/19] vendor: go mod vendor Signed-off-by: Mathieu Tortuyaux --- @@ -17029,30 +17029,30 @@ index 00000000..1b1efb0f + return +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index 1e5cbab2..3d3bae00 100644 +index 2b1e4041..0161a31b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt -@@ -129,6 +129,9 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric - # github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 - ## explicit; go 1.22 +@@ -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 +# github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 +## explicit +github.com/ajeddeloh/go-json - # github.com/aws/aws-sdk-go v1.55.7 - ## explicit; go 1.19 - github.com/aws/aws-sdk-go/aws -@@ -209,6 +212,9 @@ github.com/coreos/go-json + # github.com/aws/aws-sdk-go-v2 v1.39.2 + ## explicit; go 1.22 + 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 ## explicit; go 1.8 github.com/coreos/go-semver/semver +# github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 +## explicit +github.com/coreos/go-systemd/unit - # github.com/coreos/go-systemd/v22 v22.5.0 - ## explicit; go 1.12 + # github.com/coreos/go-systemd/v22 v22.6.0 + ## explicit; go 1.23 github.com/coreos/go-systemd/v22/dbus -@@ -270,6 +276,27 @@ github.com/envoyproxy/protoc-gen-validate/validate +@@ -316,6 +322,27 @@ github.com/envoyproxy/protoc-gen-validate/validate # github.com/felixge/httpsnoop v1.0.4 ## explicit; go 1.13 github.com/felixge/httpsnoop @@ -17077,19 +17077,19 @@ index 1e5cbab2..3d3bae00 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.0.5 - ## explicit; go 1.21 + # github.com/go-jose/go-jose/v4 v4.1.1 + ## explicit; go 1.23.0 github.com/go-jose/go-jose/v4 -@@ -456,6 +483,9 @@ go.opentelemetry.io/otel/trace +@@ -500,6 +527,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.39.0 - ## explicit; go 1.23.0 + # golang.org/x/crypto v0.43.0 + ## explicit; go 1.24.0 golang.org/x/crypto/chacha20 -- -2.49.1 +2.51.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-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 similarity index 89% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patch.patch index 8b1596a007c..f7e8dcdd01f 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-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 f84e3ffe1e864515a4552c457268db801277380d Mon Sep 17 00:00:00 2001 +From aafc9c756610faffad5bf28eb2c4661e6df5b4b9 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 19 Feb 2024 18:12:22 +0100 -Subject: [PATCH 07/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 @@ -36,5 +36,5 @@ index 30203bff..86a5cb79 100644 } -- -2.49.1 +2.51.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-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 similarity index 78% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch index 9ee7cd3855b..ad3f3809733 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-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,17 +1,17 @@ -From e968bb45604b48e25815af7ce84baa46ec3cb221 Mon Sep 17 00:00:00 2001 +From 35265ad5c3948399b9ca85ddb8675cf67961a644 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 20 Feb 2024 10:02:28 +0100 -Subject: [PATCH 08/20] provider/qemu: apply fw_cfg patch +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 | 118 ++++++++++++++------------ - 1 file changed, 63 insertions(+), 55 deletions(-) + internal/providers/qemu/qemu_fwcfg.go | 133 ++++++++++++++------------ + 1 file changed, 70 insertions(+), 63 deletions(-) diff --git a/internal/providers/qemu/qemu_fwcfg.go b/internal/providers/qemu/qemu_fwcfg.go -index 389ec119..cab9c476 100644 +index 863c9601..e8d4fec7 100644 --- a/internal/providers/qemu/qemu_fwcfg.go +++ b/internal/providers/qemu/qemu_fwcfg.go @@ -29,6 +29,7 @@ import ( @@ -37,38 +37,43 @@ index 389ec119..cab9c476 100644 ) func init() { -@@ -57,63 +60,68 @@ func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { - return types.Config{}, report.Report{}, err +@@ -56,72 +59,76 @@ func fetchConfig(f *resource.Fetcher) (cfg types.Config, rpt report.Report, err + return } - // get size of firmware blob, if it exists -- sizeBytes, err := os.ReadFile(firmwareConfigSizePath) +- var sizeBytes []byte +- sizeBytes, err = os.ReadFile(firmwareConfigSizePath) - if os.IsNotExist(err) { - f.Logger.Info("QEMU firmware config was not found. Ignoring...") -- return util.ParseConfig(f.Logger, []byte{}) +- cfg, rpt, err = util.ParseConfig(f.Logger, []byte{}) +- return - } else if err != nil { - f.Logger.Err("couldn't read QEMU firmware config size: %v", err) -- return types.Config{}, report.Report{}, err +- return - } -- size, err := strconv.Atoi(strings.TrimSpace(string(sizeBytes))) +- 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 types.Config{}, report.Report{}, err +- return - } -+ for cfg, size := range firmwareConfigPaths { ++ for cfgPath, sizePath := range firmwareConfigPaths { + // get size of firmware blob, if it exists -+ sizeBytes, err := os.ReadFile(size) ++ 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 types.Config{}, report.Report{}, err ++ return + } -+ size, err := strconv.Atoi(strings.TrimSpace(string(sizeBytes))) ++ 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 types.Config{}, report.Report{}, err ++ return + } - // Read firmware blob. We need to make as few, large read() calls as @@ -78,18 +83,22 @@ index 389ec119..cab9c476 100644 - // better, and without reallocating. - // Leave an extra guard byte to check for EOF - data := make([]byte, 0, size+1) -- fh, err := os.Open(firmwareConfigPath) +- var fh *os.File +- fh, err = os.Open(firmwareConfigPath) - if err != nil { - f.Logger.Err("couldn't open QEMU firmware config: %v", err) -- return types.Config{}, report.Report{}, err +- return - } -- defer fh.Close() +- defer func() { +- _ = fh.Close() +- }() - lastReport := time.Now() - reporting := false - for len(data) < size { - // if size is correct, we will never call this at an offset - // where it would return io.EOF -- n, err := fh.Read(data[len(data):cap(data)]) +- var n int +- n, err = fh.Read(data[len(data):cap(data)]) + // 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 @@ -97,26 +106,30 @@ index 389ec119..cab9c476 100644 + // better, and without reallocating. + // Leave an extra guard byte to check for EOF + data := make([]byte, 0, size+1) -+ fh, err := os.Open(cfg) ++ var fh *os.File ++ fh, err = os.Open(cfgPath) if err != nil { - f.Logger.Err("couldn't read QEMU firmware config: %v", err) + f.Logger.Err("couldn't open QEMU firmware config: %v", err) - return types.Config{}, report.Report{}, err + return } - data = data[:len(data)+n] - if !reporting && time.Since(lastReport).Seconds() >= 10 { - f.Logger.Warning("Reading QEMU fw_cfg takes quadratic time. Consider moving large files or config fragments to a remote URL.") - reporting = true -+ defer fh.Close() ++ defer func() { ++ fh.Close() ++ }() + lastReport := time.Now() + reporting := false + for len(data) < size { + // if size is correct, we will never call this at an offset + // where it would return io.EOF -+ n, err := fh.Read(data[len(data):cap(data)]) ++ var n int ++ n, err = fh.Read(data[len(data):cap(data)]) + if err != nil { + f.Logger.Err("couldn't read QEMU firmware config: %v", err) -+ return types.Config{}, report.Report{}, err ++ return + } + data = data[:len(data)+n] + if !reporting && time.Since(lastReport).Seconds() >= 10 { @@ -134,30 +147,33 @@ index 389ec119..cab9c476 100644 + if len(data) > size { + // overflowed into guard byte + f.Logger.Err("missing EOF reading QEMU firmware config") -+ return types.Config{}, report.Report{}, errors.New("missing EOF") ++ err = errors.New("missing EOF") ++ return } +- } +- if len(data) > size { +- // overflowed into guard byte +- f.Logger.Err("missing EOF reading QEMU firmware config") +- err = errors.New("missing EOF") + // 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, + // trust that firmwareConfigSizePath was telling the truth to avoid + // incurring an extra read call to check for EOF. We're at the end + // of the file so the extra read would be maximally expensive. -+ return util.ParseConfig(f.Logger, data) ++ cfg, rpt, err = util.ParseConfig(f.Logger, data) + return + } -- if len(data) > size { -- // overflowed into guard byte -- f.Logger.Err("missing EOF reading QEMU firmware config") -- return types.Config{}, report.Report{}, errors.New("missing EOF") -- } - // 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, - // trust that firmwareConfigSizePath was telling the truth to avoid - // incurring an extra read call to check for EOF. We're at the end - // of the file so the extra read would be maximally expensive. -- return util.ParseConfig(f.Logger, data) +- cfg, rpt, err = util.ParseConfig(f.Logger, data) +- return + return types.Config{}, report.Report{}, iErrors.ErrEmpty + } -- -2.49.1 +2.51.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-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 similarity index 92% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-3_6-test-add-ignition-2.x-test-cases.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-config-3_6-test-add-ignition-2.x-test-cases.patch index bb20a46e3ed..888aa3e0077 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-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 @@ -1,7 +1,7 @@ -From 158a17fe6da1c9e30f8d177e375a7424e19954b4 Mon Sep 17 00:00:00 2001 +From 719b3ca13660a9d53afef3c4f0a4ac1824af5615 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 2 Sep 2021 11:03:17 +0200 -Subject: [PATCH 09/20] config/3_6/test: add ignition 2.x test cases +Subject: [PATCH 08/19] config/3_6/test: add ignition 2.x test cases Signed-off-by: Mathieu Tortuyaux --- @@ -40,5 +40,5 @@ index 54cbd91c..99f2e3dd 100644 in: in{config: []byte(`{"ignition": {"version": "3.0.0"}}`)}, out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}}, -- -2.49.1 +2.51.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch similarity index 86% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch index 27d2c298d2c..d7d28430340 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch @@ -1,7 +1,7 @@ -From d4cbad99a8dfce27c34d6373b49c50b3a2942bb3 Mon Sep 17 00:00:00 2001 +From 74b323eea057235dd0aa755f115fbb44a9ae7a8a Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 22 Sep 2021 14:53:49 +0200 -Subject: [PATCH 10/20] internal/disk/fs: ignore fs format mismatches for the +Subject: [PATCH 09/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 c575ced4..fefd1fff 100644 +index a12c59d7..360267ff 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 { @@ -33,7 +33,7 @@ index c575ced4..fefd1fff 100644 + if (info.Type == fileSystemFormat || info.Label == "OEM") && (fs.Label == nil || info.Label == *fs.Label) && (fs.UUID == nil || canonicalizeFilesystemUUID(info.Type, info.UUID) == canonicalizeFilesystemUUID(fileSystemFormat, *fs.UUID)) { - s.Logger.Info("filesystem at %q is already correctly formatted. Skipping mkfs...", fs.Device) + s.Info("filesystem at %q is already correctly formatted. Skipping mkfs...", fs.Device) -- -2.49.1 +2.51.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch similarity index 97% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch index ebe9de811a4..d097e541bd3 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch @@ -1,7 +1,7 @@ -From d4896d39233152d8fb772fa509a7d02134980fe8 Mon Sep 17 00:00:00 2001 +From f1d4bbdd0ae6e123301837e9de77dffd199c3ec5 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 20 Feb 2024 10:12:02 +0100 -Subject: [PATCH 11/20] VMware: Fix guestinfo.*.config.data and *.config.url +Subject: [PATCH 10/19] VMware: Fix guestinfo.*.config.data and *.config.url variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -164,5 +164,5 @@ index 597c33fd..3680a4cd 100644 func delConfig(f *resource.Fetcher) error { -- -2.49.1 +2.51.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-config-version-handle-configuration-version-1.patch similarity index 91% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-config-version-handle-configuration-version-1.patch index 824380f5c24..a9ea182e7f6 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-config-version-handle-configuration-version-1.patch @@ -1,7 +1,7 @@ -From 036b7ac1ccb58b628698e252e19009a8d6ee39e9 Mon Sep 17 00:00:00 2001 +From 402f725c7920c5da17faa3aba651335ec32b9b18 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 2 Feb 2022 13:27:18 +0100 -Subject: [PATCH 12/20] config/version: handle configuration version 1 +Subject: [PATCH 11/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.49.1 +2.51.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-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/0013-config-util-add-cloud-init-detection-to-initial-pars.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-util-add-cloud-init-detection-to-initial-pars.patch index 88dec28e0ec..508ce69b98b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-util-add-cloud-init-detection-to-initial-pars.patch @@ -1,7 +1,7 @@ -From d888888eb3e6eaad7fba6b62e3245d25576a19b9 Mon Sep 17 00:00:00 2001 +From 0681a97d6d1303aea87990d0a87870535eaedc2c Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 22 Feb 2022 15:41:13 +0100 -Subject: [PATCH 13/20] config/util: add cloud init detection to initial +Subject: [PATCH 12/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.49.1 +2.51.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-Revert-drop-OEM-URI-support.patch similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-Revert-drop-OEM-URI-support.patch index 0ef696ab216..df6996e60dc 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-Revert-drop-OEM-URI-support.patch @@ -1,7 +1,7 @@ -From 70d0e48e5339081461a4a6815a07ee80e0d39310 Mon Sep 17 00:00:00 2001 +From b617624e830507f68268db881fdb1576ed25fb41 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 25 May 2022 10:38:16 +0200 -Subject: [PATCH 14/20] Revert "*: drop OEM URI support" +Subject: [PATCH 13/19] Revert "*: drop OEM URI support" This reverts commit 0c088d6de77aa1b1f47b9252a07f51cb1e249df3. --- @@ -68,7 +68,7 @@ index bf1f3a5e..63297beb 100644 case "s3": if v, ok := u.Query()["versionId"]; ok { diff --git a/config/v3_4/types/url.go b/config/v3_4/types/url.go -index 9b2b4405..5258c3c6 100644 +index b1f96337..752044ce 100644 --- a/config/v3_4/types/url.go +++ b/config/v3_4/types/url.go @@ -32,7 +32,7 @@ func validateURL(s string) error { @@ -81,7 +81,7 @@ index 9b2b4405..5258c3c6 100644 case "s3": if v, ok := u.Query()["versionId"]; ok { diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md -index 5f508761..b81beee0 100644 +index afd49437..f8e1d3ae 100644 --- a/docs/supported-platforms.md +++ b/docs/supported-platforms.md @@ -12,6 +12,7 @@ Ignition is currently supported for the following platforms: @@ -93,7 +93,7 @@ index 5f508761..b81beee0 100644 * [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 eb4c3179..2726d705 100644 +index 9d9351e7..f3c32aaf 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go @@ -23,13 +23,17 @@ import ( @@ -132,7 +132,7 @@ index eb4c3179..2726d705 100644 func GroupaddCmd() string { return groupaddCmd } func GroupdelCmd() string { return groupdelCmd } diff --git a/internal/resource/url.go b/internal/resource/url.go -index 354385fa..f7b855d8 100644 +index 5f08f059..a9f7f7ba 100644 --- a/internal/resource/url.go +++ b/internal/resource/url.go @@ -23,10 +23,12 @@ import ( @@ -158,7 +158,7 @@ index 354385fa..f7b855d8 100644 "github.com/flatcar/ignition/v2/internal/util" "golang.org/x/oauth2/google" "google.golang.org/api/option" -@@ -170,6 +174,8 @@ func (f *Fetcher) FetchToBuffer(u url.URL, opts FetchOptions) ([]byte, error) { +@@ -165,6 +169,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) @@ -166,8 +166,8 @@ index 354385fa..f7b855d8 100644 + err = f.fetchFromOEM(u, dest, opts) case "s3", "arn": buf := &s3buf{ - WriteAtBuffer: aws.NewWriteAtBuffer([]byte{}), -@@ -242,6 +248,8 @@ func (f *Fetcher) Fetch(u url.URL, dest *os.File, opts FetchOptions) error { + WriteAtBuffer: manager.NewWriteAtBuffer([]byte{}), +@@ -237,6 +243,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) @@ -176,7 +176,7 @@ index 354385fa..f7b855d8 100644 case "s3", "arn": return f.fetchFromS3(u, dest, opts) case "gs": -@@ -450,6 +458,53 @@ type s3target interface { +@@ -447,6 +455,53 @@ type s3target interface { io.ReadSeeker } @@ -230,7 +230,7 @@ index 354385fa..f7b855d8 100644 // FetchFromS3 gets data from an S3 bucket as described by u and writes it into // 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 -@@ -725,3 +780,39 @@ func (f *Fetcher) parseARN(arnURL string) (string, string, string, string, error +@@ -735,3 +790,39 @@ func (f *Fetcher) parseARN(arnURL string) (string, string, string, string, error key := strings.Join(urlSplit[1:], "/") return bucket, key, "", regionHint, nil } @@ -271,5 +271,5 @@ index 354385fa..f7b855d8 100644 + ) +} -- -2.49.1 +2.51.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-internal-resource-url-support-btrfs-as-OEM-partition.patch similarity index 83% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-internal-resource-url-support-btrfs-as-OEM-partition.patch index a626bd2452a..a40d110aaf8 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-internal-resource-url-support-btrfs-as-OEM-partition.patch @@ -1,7 +1,7 @@ -From 0b656bf09a53e721c6175e868dedf2904d3f15bc Mon Sep 17 00:00:00 2001 +From ca4cd35a3124d696c236549111b1655f6feffb97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Wed, 7 Jul 2021 18:40:52 +0200 -Subject: [PATCH 15/20] internal/resource/url: support btrfs as OEM partition +Subject: [PATCH 14/19] internal/resource/url: support btrfs as OEM partition filesystem When btrfs is used to fit more content into the partition, mounting @@ -12,10 +12,10 @@ When mounting ext4 fails, try mounting as btrfs. 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/internal/resource/url.go b/internal/resource/url.go -index f7b855d8..e66707fd 100644 +index a9f7f7ba..4471db96 100644 --- a/internal/resource/url.go +++ b/internal/resource/url.go -@@ -801,8 +801,17 @@ func (f *Fetcher) mountOEM(oemMountPath string) error { +@@ -811,8 +811,17 @@ func (f *Fetcher) mountOEM(oemMountPath string) error { }, "mounting %q at %q", distro.OEMDevicePath(), oemMountPath, ); err != nil { @@ -35,5 +35,5 @@ index f7b855d8..e66707fd 100644 return nil -- -2.49.1 +2.51.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-translation-support-OEM-and-oem.patch similarity index 97% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-translation-support-OEM-and-oem.patch index 10f18bf841f..27f43f49572 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-translation-support-OEM-and-oem.patch @@ -1,7 +1,7 @@ -From e03851847226e52f6a5eb2224fe9b32b2f4ca592 Mon Sep 17 00:00:00 2001 +From fa025a6d4c641da40ab152288a047f2e725c685e Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 10 Nov 2022 11:58:49 +0100 -Subject: [PATCH 16/20] translation: support OEM and oem +Subject: [PATCH 15/19] translation: support OEM and oem Signed-off-by: Mathieu Tortuyaux --- @@ -157,5 +157,5 @@ index e81f6bed..68c07109 100644 + } +} -- -2.49.1 +2.51.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-revert-internal-oem-drop-noop-OEMs.patch similarity index 89% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-revert-internal-oem-drop-noop-OEMs.patch index 79e8ad1bbdd..cf576c5fbba 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-revert-internal-oem-drop-noop-OEMs.patch @@ -1,7 +1,7 @@ -From 198f62a4845d171bbdc73893715da2fb6b4df382 Mon Sep 17 00:00:00 2001 +From 60a6c5a81e06fbaed6939ac925937ca941f0732e Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 20 Feb 2024 10:25:24 +0100 -Subject: [PATCH 17/20] revert: internal/oem: drop noop OEMs +Subject: [PATCH 16/19] revert: internal/oem: drop noop OEMs This reverts: https://github.com/flatcar/ignition/commit/26828f92e00060aa8ebf2197545ad602af237132 @@ -42,5 +42,5 @@ index 27c923d4..ae259f8f 100644 func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { -- -2.49.1 +2.51.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch similarity index 84% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch index 122122327f1..8f5ccef2a12 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch @@ -1,7 +1,7 @@ -From 1e45cd2bea29d19cdce12c6708ae93b53a63e42f Mon Sep 17 00:00:00 2001 +From 9840bd7740f5667f8b2d6e3d87da226dab14bf83 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 4 Mar 2024 15:05:14 +0100 -Subject: [PATCH 18/20] docs: Add re-added platforms to docs to pass tests +Subject: [PATCH 17/19] docs: Add re-added platforms to docs to pass tests Signed-off-by: Mathieu Tortuyaux Co-Authored-By: Krzesimir Nowak Date: Tue, 4 Apr 2023 12:12:42 +0200 -Subject: [PATCH 19/20] /usr/share/oem -> /oem +Subject: [PATCH 18/19] /usr/share/oem -> /oem --- config/util/translate.go | 2 +- @@ -22,7 +22,7 @@ index 347d148c..d4c057b2 100644 // 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 2726d705..c335eeee 100644 +index f3c32aaf..7359eefe 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go @@ -32,7 +32,10 @@ var ( @@ -38,5 +38,5 @@ index 2726d705..c335eeee 100644 // Helper programs -- -2.49.1 +2.51.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-internal-exec-stages-mount-Mount-oem.patch similarity index 88% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-internal-exec-stages-mount-Mount-oem.patch index 4e8b3d0c11d..f2ba83f7272 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-internal-exec-stages-mount-Mount-oem.patch @@ -1,7 +1,7 @@ -From a00ce4cd775722e87f97a529d4ff802f0d7f37c9 Mon Sep 17 00:00:00 2001 +From 5f7a7e20cfe8cf4a15fab5bfaa1cf34968f1b33a Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 May 2023 17:43:43 +0200 -Subject: [PATCH 20/20] internal/exec/stages/mount: Mount /oem +Subject: [PATCH 19/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 bace4bbd..bc6767d2 100644 +index 72bd781e..803c40f6 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 bace4bbd..bc6767d2 100644 if err := checkForNonDirectories(path); err != nil { return err -- -2.49.1 +2.51.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.22.0.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.22.0.ebuild deleted file mode 100644 index f9e8fa41453..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.22.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright (c) 2015 CoreOS, Inc.. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit go-module - -KEYWORDS="amd64 arm64" - -DESCRIPTION="Pre-boot provisioning utility" -HOMEPAGE="https://github.com/coreos/ignition" -SRC_URI="https://github.com/coreos/ignition/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PVR}" -IUSE="" - -# need util-linux for libblkid at compile time -DEPEND="sys-apps/util-linux" - -RDEPEND=" - sys-apps/coreutils - sys-apps/gptfdisk - sys-apps/shadow - sys-apps/systemd - sys-fs/btrfs-progs - sys-fs/dosfstools - sys-fs/e2fsprogs - sys-fs/mdadm - sys-fs/xfsprogs -" - -RDEPEND+="${DEPEND}" - -PATCHES=( - "${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-sum-go-mod-tidy.patch" - "${FILESDIR}/0005-vendor-go-mod-vendor.patch" - "${FILESDIR}/0006-config-v3_6-convert-ignition-2.x-to-3.x.patch" - "${FILESDIR}/0007-internal-prv-cmdline-backport-flatcar-patch.patch" - "${FILESDIR}/0008-provider-qemu-apply-fw_cfg-patch.patch" - "${FILESDIR}/0009-config-3_6-test-add-ignition-2.x-test-cases.patch" - "${FILESDIR}/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch" - "${FILESDIR}/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch" - "${FILESDIR}/0012-config-version-handle-configuration-version-1.patch" - "${FILESDIR}/0013-config-util-add-cloud-init-detection-to-initial-pars.patch" - "${FILESDIR}/0014-Revert-drop-OEM-URI-support.patch" - "${FILESDIR}/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch" - "${FILESDIR}/0016-translation-support-OEM-and-oem.patch" - "${FILESDIR}/0017-revert-internal-oem-drop-noop-OEMs.patch" - "${FILESDIR}/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch" - "${FILESDIR}/0019-usr-share-oem-oem.patch" - "${FILESDIR}/0020-internal-exec-stages-mount-Mount-oem.patch" -) - -src_compile() { - ego build \ - -ldflags "-X github.com/flatcar/ignition/v2/internal/version.Raw=${PV} -X github.com/flatcar/ignition/v2/internal/distro.selinuxRelabel=false" \ - "${S}/internal/main.go" -} - -src_install() { - newbin "${S}/main" "${PN}" - - dosym "/usr/bin/${PN}" "/usr/libexec/${PN}-rmcfg" -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.24.0.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.24.0.ebuild new file mode 100644 index 00000000000..342d0f58555 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.24.0.ebuild @@ -0,0 +1,66 @@ +# Copyright (c) 2015 CoreOS, Inc.. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit go-module + +KEYWORDS="amd64 arm64" + +DESCRIPTION="Pre-boot provisioning utility" +HOMEPAGE="https://github.com/coreos/ignition" +SRC_URI="https://github.com/coreos/ignition/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PVR}" +IUSE="" + +# need util-linux for libblkid at compile time +DEPEND="sys-apps/util-linux" + +RDEPEND=" + sys-apps/coreutils + sys-apps/gptfdisk + sys-apps/shadow + sys-apps/systemd + sys-fs/btrfs-progs + sys-fs/dosfstools + sys-fs/e2fsprogs + sys-fs/mdadm + sys-fs/xfsprogs +" + +RDEPEND+="${DEPEND}" + +PATCHES=( + "${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}/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-Revert-drop-OEM-URI-support.patch" + "${FILESDIR}/0014-internal-resource-url-support-btrfs-as-OEM-partition.patch" + "${FILESDIR}/0015-translation-support-OEM-and-oem.patch" + "${FILESDIR}/0016-revert-internal-oem-drop-noop-OEMs.patch" + "${FILESDIR}/0017-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch" + "${FILESDIR}/0018-usr-share-oem-oem.patch" + "${FILESDIR}/0019-internal-exec-stages-mount-Mount-oem.patch" +) + +src_compile() { + ego build \ + -ldflags "-X github.com/flatcar/ignition/v2/internal/version.Raw=${PV} -X github.com/flatcar/ignition/v2/internal/distro.selinuxRelabel=false" \ + "${S}/internal/main.go" +} + +src_install() { + newbin "${S}/main" "${PN}" + + dosym "/usr/bin/${PN}" "/usr/libexec/${PN}-rmcfg" +}