diff --git a/changelog/updates/2025-08-12-ignition.md b/changelog/updates/2025-08-12-ignition.md new file mode 100644 index 00000000000..dc16903aa27 --- /dev/null +++ b/changelog/updates/2025-08-12-ignition.md @@ -0,0 +1 @@ +- Ignition ([2.22.0](https://coreos.github.io/ignition/release-notes/#ignition-2220-2025-07-08)) 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 new file mode 100644 index 00000000000..b864dd3ef34 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/Manifest @@ -0,0 +1 @@ +DIST ignition-2.22.0.tar.gz 8262012 BLAKE2B f6406c88a9085dcc2c75a28a31ff9a67377745c55cc909e6e1fd4443f522004bc4a5c3d7c41d317e81b014dea2b96a16cbe4072173b8af7a6db7081b45741d01 SHA512 fd9fbe28b77c0593c4ca3f7d08fcb46c56c29d8fd4365c37856b8ccfd178d3cbb44dbe15effcfada3da851bece893edfe2b4de2c4873a90c909322a8c806143a 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 cc4b1c5d780..1b8a26993c9 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,16 +1,15 @@ -From b5389d2eadf0fa4a6892a6e69e4f127aa078aef6 Mon Sep 17 00:00:00 2001 +From 83334ffac4b77d25c9ef474075170e21241f006a Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Wed, 26 Mar 2025 15:06:07 +0100 +Date: Tue, 12 Aug 2025 15:04:40 +0200 Subject: [PATCH 01/20] *: sed `s/coreos/flatcar/` Signed-off-by: Mathieu Tortuyaux --- - build | 4 +- config/config.go | 4 +- config/config_test.go | 16 +++--- config/doc/generate.go | 2 +- config/doc/schema.go | 2 +- - config/merge/merge.go | 6 +-- + config/merge/merge.go | 6 +- config/merge/merge_test.go | 8 +-- config/shared/validations/unit.go | 2 +- config/translate/translate.go | 2 +- @@ -39,7 +38,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_0/types/raid_test.go | 4 +- config/v3_0/types/storage.go | 4 +- config/v3_0/types/storage_test.go | 4 +- - config/v3_0/types/systemd.go | 6 +-- + config/v3_0/types/systemd.go | 6 +- config/v3_0/types/systemd_test.go | 4 +- config/v3_0/types/unit.go | 8 +-- config/v3_0/types/unit_test.go | 4 +- @@ -76,7 +75,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_1/types/resource.go | 4 +- config/v3_1/types/storage.go | 4 +- config/v3_1/types/storage_test.go | 4 +- - config/v3_1/types/systemd.go | 6 +-- + config/v3_1/types/systemd.go | 6 +- config/v3_1/types/systemd_test.go | 4 +- config/v3_1/types/unit.go | 8 +-- config/v3_1/types/unit_test.go | 4 +- @@ -86,7 +85,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_1/types/verification_test.go | 2 +- config/v3_2/config.go | 14 ++--- config/v3_2/config_test.go | 4 +- - config/v3_2/translate/translate.go | 6 +-- + config/v3_2/translate/translate.go | 6 +- config/v3_2/translate/translate_test.go | 4 +- config/v3_2/types/config.go | 4 +- config/v3_2/types/config_test.go | 4 +- @@ -115,7 +114,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_2/types/resource.go | 4 +- config/v3_2/types/storage.go | 4 +- config/v3_2/types/storage_test.go | 4 +- - config/v3_2/types/systemd.go | 6 +-- + config/v3_2/types/systemd.go | 6 +- config/v3_2/types/systemd_test.go | 4 +- config/v3_2/types/tang.go | 4 +- config/v3_2/types/unit.go | 8 +-- @@ -157,7 +156,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_3/types/resource.go | 4 +- config/v3_3/types/storage.go | 4 +- config/v3_3/types/storage_test.go | 4 +- - config/v3_3/types/systemd.go | 6 +-- + config/v3_3/types/systemd.go | 6 +- config/v3_3/types/systemd_test.go | 4 +- config/v3_3/types/tang.go | 4 +- config/v3_3/types/unit.go | 8 +-- @@ -168,7 +167,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_3/types/verification_test.go | 2 +- config/v3_4/config.go | 14 ++--- config/v3_4/config_test.go | 4 +- - config/v3_4/translate/translate.go | 8 +-- + config/v3_4/translate/translate.go | 6 +- config/v3_4/translate/translate_test.go | 4 +- config/v3_4/types/clevis.go | 4 +- config/v3_4/types/clevis_test.go | 4 +- @@ -199,7 +198,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_4/types/resource.go | 4 +- config/v3_4/types/storage.go | 4 +- config/v3_4/types/storage_test.go | 4 +- - config/v3_4/types/systemd.go | 6 +-- + config/v3_4/types/systemd.go | 6 +- config/v3_4/types/systemd_test.go | 4 +- config/v3_4/types/tang.go | 4 +- config/v3_4/types/tang_test.go | 4 +- @@ -211,7 +210,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_4/types/verification_test.go | 2 +- config/v3_5/config.go | 14 ++--- config/v3_5/config_test.go | 4 +- - config/v3_5/translate/translate.go | 6 +-- + config/v3_5/translate/translate.go | 6 +- config/v3_5/translate/translate_test.go | 4 +- config/v3_5/types/cex.go | 2 +- config/v3_5/types/cex_test.go | 2 +- @@ -244,7 +243,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_5/types/resource.go | 4 +- config/v3_5/types/storage.go | 4 +- config/v3_5/types/storage_test.go | 4 +- - config/v3_5/types/systemd.go | 6 +-- + config/v3_5/types/systemd.go | 6 +- config/v3_5/types/systemd_test.go | 4 +- config/v3_5/types/tang.go | 4 +- config/v3_5/types/tang_test.go | 4 +- @@ -256,7 +255,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_5/types/verification_test.go | 2 +- config/v3_6_experimental/config.go | 14 ++--- config/v3_6_experimental/config_test.go | 4 +- - .../v3_6_experimental/translate/translate.go | 6 +-- + .../v3_6_experimental/translate/translate.go | 8 +-- .../translate/translate_test.go | 4 +- config/v3_6_experimental/types/cex.go | 2 +- config/v3_6_experimental/types/cex_test.go | 2 +- @@ -289,7 +288,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_6_experimental/types/resource.go | 4 +- config/v3_6_experimental/types/storage.go | 4 +- .../v3_6_experimental/types/storage_test.go | 4 +- - config/v3_6_experimental/types/systemd.go | 6 +-- + config/v3_6_experimental/types/systemd.go | 6 +- .../v3_6_experimental/types/systemd_test.go | 4 +- config/v3_6_experimental/types/tang.go | 4 +- config/v3_6_experimental/types/tang_test.go | 4 +- @@ -302,24 +301,24 @@ Signed-off-by: Mathieu Tortuyaux config/validate/validate.go | 4 +- config/validate/validate_test.go | 2 +- go.mod | 2 +- - internal/apply/apply.go | 30 +++++------ + internal/apply/apply.go | 30 +++++----- internal/distro/distro.go | 2 +- internal/doc/main.go | 16 +++--- - internal/exec/config_fetcher.go | 18 +++---- + internal/exec/config_fetcher.go | 18 +++--- 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 ++--- + 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 +++--- .../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 ++--- + .../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 | 12 ++-- internal/exec/stages/files/units_test.go | 4 +- internal/exec/stages/kargs/kargs.go | 14 ++--- internal/exec/stages/mount/mount.go | 16 +++--- @@ -331,54 +330,55 @@ Signed-off-by: Mathieu Tortuyaux internal/exec/util/selinux.go | 2 +- internal/exec/util/unit.go | 4 +- internal/exec/util/user_group_lookup_test.go | 2 +- - internal/exec/util/util.go | 6 +-- - internal/main.go | 18 +++---- + internal/exec/util/util.go | 6 +- + internal/main.go | 18 +++--- internal/platform/platform.go | 10 ++-- internal/providers/akamai/akamai.go | 8 +-- internal/providers/aliyun/aliyun.go | 8 +-- internal/providers/applehv/applehv.go | 10 ++-- - internal/providers/aws/aws.go | 12 ++--- + internal/providers/aws/aws.go | 12 ++-- internal/providers/azure/azure.go | 16 +++--- internal/providers/azurestack/azurestack.go | 8 +-- internal/providers/cloudstack/cloudstack.go | 16 +++--- - internal/providers/cmdline/cmdline.go | 12 ++--- + internal/providers/cmdline/cmdline.go | 12 ++-- .../providers/digitalocean/digitalocean.go | 8 +-- internal/providers/exoscale/exoscale.go | 8 +-- internal/providers/file/file.go | 8 +-- internal/providers/gcp/gcp.go | 8 +-- internal/providers/hetzner/hetzner.go | 8 +-- - internal/providers/hyperv/kvp.go | 12 ++--- + internal/providers/hyperv/kvp.go | 12 ++-- internal/providers/ibmcloud/ibmcloud.go | 14 ++--- 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/oraclecloud/oraclecloud.go | 8 +-- internal/providers/packet/packet.go | 8 +-- internal/providers/powervs/powervs.go | 14 ++--- internal/providers/proxmoxve/proxmoxve.go | 14 ++--- - internal/providers/qemu/qemu_blockdev.go | 12 ++--- + internal/providers/qemu/qemu_blockdev.go | 12 ++-- internal/providers/qemu/qemu_fwcfg.go | 10 ++-- internal/providers/scaleway/scaleway.go | 8 +-- internal/providers/system/system.go | 14 ++--- - internal/providers/util/config.go | 6 +-- + internal/providers/util/config.go | 6 +- internal/providers/util/file.go | 4 +- internal/providers/util/unzip_test.go | 2 +- internal/providers/virtualbox/virtualbox.go | 10 ++-- internal/providers/vmware/vmware_amd64.go | 8 +-- - .../providers/vmware/vmware_unsupported.go | 6 +-- + .../providers/vmware/vmware_unsupported.go | 6 +- internal/providers/vultr/vultr.go | 8 +-- internal/providers/zvm/zvm.go | 14 ++--- - internal/register/providers.go | 54 +++++++++---------- + internal/register/providers.go | 56 +++++++++---------- internal/register/stages.go | 14 ++--- - internal/resource/http.go | 12 ++--- - internal/resource/url.go | 6 +-- - internal/resource/url_test.go | 6 +-- + internal/resource/http.go | 12 ++-- + internal/resource/url.go | 6 +- + internal/resource/url_test.go | 6 +- internal/sgdisk/sgdisk.go | 8 +-- internal/state/state.go | 2 +- internal/util/tools/docs/docs.go | 2 +- internal/util/verification.go | 2 +- internal/util/verification_test.go | 2 +- - tests/blackbox_test.go | 12 ++--- + tests/blackbox_test.go | 12 ++-- tests/filesystem.go | 4 +- tests/negative/files/invalid_hash.go | 4 +- tests/negative/files/link.go | 4 +- @@ -394,20 +394,20 @@ Signed-off-by: Mathieu Tortuyaux tests/negative/partitions/zeroes.go | 4 +- tests/negative/proxy/http.go | 4 +- tests/negative/regression/filesystem.go | 4 +- - tests/negative/security/tls.go | 6 +-- + tests/negative/security/tls.go | 6 +- tests/negative/timeouts/timeouts.go | 4 +- tests/positive/files/directory.go | 4 +- - tests/positive/files/file.go | 4 +- - tests/positive/files/hash.go | 6 +-- - tests/positive/files/link.go | 6 +-- - tests/positive/files/remote.go | 6 +-- + tests/positive/files/file.go | 6 +- + tests/positive/files/hash.go | 6 +- + tests/positive/files/link.go | 6 +- + tests/positive/files/remote.go | 6 +- tests/positive/files/units.go | 4 +- tests/positive/filesystems/creation.go | 4 +- .../positive/filesystems/mount_filesystem.go | 4 +- - .../filesystems/reformat_filesystem.go | 6 +-- - .../positive/filesystems/reuse_filesystem.go | 6 +-- + .../filesystems/reformat_filesystem.go | 6 +- + .../positive/filesystems/reuse_filesystem.go | 6 +- tests/positive/general/baseconfigsmerging.go | 4 +- - tests/positive/general/general.go | 6 +-- + tests/positive/general/general.go | 6 +- tests/positive/general/preemption.go | 4 +- tests/positive/luks/creation.go | 4 +- tests/positive/partitions/complex-mb.go | 4 +- @@ -426,34 +426,12 @@ Signed-off-by: Mathieu Tortuyaux tests/positive/systemd/modify_service.go | 4 +- tests/positive/timeouts/timeouts.go | 4 +- tests/register/register.go | 16 +++--- - tests/registry/registry.go | 40 +++++++------- + tests/registry/registry.go | 40 ++++++------- tests/servers/servers.go | 2 +- tests/validator.go | 4 +- validate/main.go | 4 +- - 425 files changed, 1130 insertions(+), 1130 deletions(-) + 425 files changed, 1134 insertions(+), 1134 deletions(-) -diff --git a/build b/build -index 9bf93d61..5abdcf5f 100755 ---- a/build -+++ b/build -@@ -5,7 +5,7 @@ set -eu - export GO111MODULE=on - - NAME="ignition" --ORG_PATH="github.com/coreos" -+ORG_PATH="github.com/flatcar" - REPO_PATH="${ORG_PATH}/${NAME}/v2" - GLDFLAGS=${GLDFLAGS:-} - export GOFLAGS=-mod=vendor -@@ -15,7 +15,7 @@ if [ -z ${VERSION+a} ]; then - echo "Using version from git: $VERSION" - fi - --GLDFLAGS+="-X github.com/coreos/ignition/v2/internal/version.Raw=${VERSION}" -+GLDFLAGS+="-X github.com/flatcar/ignition/v2/internal/version.Raw=${VERSION}" - - eval $(go env) - diff --git a/config/config.go b/config/config.go index 47e82214..0cbdb15d 100644 --- a/config/config.go @@ -2924,19 +2902,17 @@ index 0ee908d7..6ecb4b44 100644 ) diff --git a/config/v3_4/translate/translate.go b/config/v3_4/translate/translate.go -index 5d748d82..38873ea8 100644 +index 5f6a23b8..fa0e27ab 100644 --- a/config/v3_4/translate/translate.go +++ b/config/v3_4/translate/translate.go -@@ -15,10 +15,10 @@ +@@ -15,9 +15,9 @@ package translate import ( - "github.com/coreos/ignition/v2/config/translate" -- "github.com/coreos/ignition/v2/config/util" - old_types "github.com/coreos/ignition/v2/config/v3_3/types" - "github.com/coreos/ignition/v2/config/v3_4/types" + "github.com/flatcar/ignition/v2/config/translate" -+ "github.com/flatcar/ignition/v2/config/util" + old_types "github.com/flatcar/ignition/v2/config/v3_3/types" + "github.com/flatcar/ignition/v2/config/v3_4/types" ) @@ -3033,7 +3009,7 @@ index 8caf8499..29fd3900 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_4/types/file.go b/config/v3_4/types/file.go -index 9b71bb26..e3f7fbdf 100644 +index 4e7566bd..f86d520b 100644 --- a/config/v3_4/types/file.go +++ b/config/v3_4/types/file.go @@ -15,8 +15,8 @@ @@ -3160,7 +3136,7 @@ index 90d72387..2862ebae 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_4/types/mode.go b/config/v3_4/types/mode.go -index 9eb7573d..67c7ebd3 100644 +index ad3e51c2..8f15a8cb 100644 --- a/config/v3_4/types/mode.go +++ b/config/v3_4/types/mode.go @@ -15,7 +15,7 @@ @@ -3173,10 +3149,10 @@ index 9eb7573d..67c7ebd3 100644 func validateMode(m *int) error { diff --git a/config/v3_4/types/mode_test.go b/config/v3_4/types/mode_test.go -index 8966e25d..5c973dbf 100644 +index 8df91455..1c2e9404 100644 --- a/config/v3_4/types/mode_test.go +++ b/config/v3_4/types/mode_test.go -@@ -18,8 +18,8 @@ import ( +@@ -19,8 +19,8 @@ import ( "reflect" "testing" @@ -3184,9 +3160,9 @@ index 8966e25d..5c973dbf 100644 - "github.com/coreos/ignition/v2/config/util" + "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/util" + "github.com/stretchr/testify/assert" ) - func TestModeValidate(t *testing.T) { diff --git a/config/v3_4/types/node.go b/config/v3_4/types/node.go index 248276e7..f4e94f9e 100644 --- a/config/v3_4/types/node.go @@ -3704,7 +3680,7 @@ index 8caf8499..29fd3900 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_5/types/file.go b/config/v3_5/types/file.go -index 9b71bb26..e3f7fbdf 100644 +index 4e7566bd..f86d520b 100644 --- a/config/v3_5/types/file.go +++ b/config/v3_5/types/file.go @@ -15,8 +15,8 @@ @@ -3831,7 +3807,7 @@ index e4c1d681..ce9d087f 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_5/types/mode.go b/config/v3_5/types/mode.go -index 9eb7573d..67c7ebd3 100644 +index ad3e51c2..8f15a8cb 100644 --- a/config/v3_5/types/mode.go +++ b/config/v3_5/types/mode.go @@ -15,7 +15,7 @@ @@ -3844,10 +3820,10 @@ index 9eb7573d..67c7ebd3 100644 func validateMode(m *int) error { diff --git a/config/v3_5/types/mode_test.go b/config/v3_5/types/mode_test.go -index 8966e25d..5c973dbf 100644 +index 8df91455..1c2e9404 100644 --- a/config/v3_5/types/mode_test.go +++ b/config/v3_5/types/mode_test.go -@@ -18,8 +18,8 @@ import ( +@@ -19,8 +19,8 @@ import ( "reflect" "testing" @@ -3855,9 +3831,9 @@ index 8966e25d..5c973dbf 100644 - "github.com/coreos/ignition/v2/config/util" + "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/util" + "github.com/stretchr/testify/assert" ) - func TestModeValidate(t *testing.T) { diff --git a/config/v3_5/types/node.go b/config/v3_5/types/node.go index 248276e7..f4e94f9e 100644 --- a/config/v3_5/types/node.go @@ -4242,22 +4218,24 @@ index 8ba56163..54cbd91c 100644 ) diff --git a/config/v3_6_experimental/translate/translate.go b/config/v3_6_experimental/translate/translate.go -index bf3f11e9..a0755bb4 100644 +index 8fa25674..4dfb1827 100644 --- a/config/v3_6_experimental/translate/translate.go +++ b/config/v3_6_experimental/translate/translate.go -@@ -15,9 +15,9 @@ +@@ -15,10 +15,10 @@ package translate import ( - "github.com/coreos/ignition/v2/config/translate" +- "github.com/coreos/ignition/v2/config/util" - old_types "github.com/coreos/ignition/v2/config/v3_5/types" - "github.com/coreos/ignition/v2/config/v3_6_experimental/types" + "github.com/flatcar/ignition/v2/config/translate" ++ "github.com/flatcar/ignition/v2/config/util" + old_types "github.com/flatcar/ignition/v2/config/v3_5/types" + "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ) - func translateIgnition(old old_types.Ignition) (ret types.Ignition) { + func translateFileEmbedded1(old old_types.FileEmbedded1) (ret types.FileEmbedded1) { diff --git a/config/v3_6_experimental/translate/translate_test.go b/config/v3_6_experimental/translate/translate_test.go index fc9e3de5..cc041bdc 100644 --- a/config/v3_6_experimental/translate/translate_test.go @@ -4901,15 +4879,15 @@ index 18eea933..4f77f19c 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/go.mod b/go.mod -index 63d73c98..f94bbafa 100644 +index c4aca58f..a34e8f5e 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.22.0 - toolchain go1.23.6 + go 1.23.0 + diff --git a/internal/apply/apply.go b/internal/apply/apply.go index db48b8dc..b98fdf5d 100644 --- a/internal/apply/apply.go @@ -5469,7 +5447,7 @@ index 9574cb33..6d5e2621 100644 const ( diff --git a/internal/exec/util/file.go b/internal/exec/util/file.go -index ee40b2a8..da9f9249 100644 +index f944acfe..d3942741 100644 --- a/internal/exec/util/file.go +++ b/internal/exec/util/file.go @@ -26,11 +26,11 @@ import ( @@ -6061,6 +6039,25 @@ index 3578256e..3377b448 100644 if f.Offline { 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 +--- a/internal/providers/oraclecloud/oraclecloud.go ++++ b/internal/providers/oraclecloud/oraclecloud.go +@@ -24,10 +24,10 @@ import ( + "net/http" + "net/url" + +- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" +- "github.com/coreos/ignition/v2/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" + ) diff --git a/internal/providers/packet/packet.go b/internal/providers/packet/packet.go index a1bb5d14..45c55964 100644 --- a/internal/providers/packet/packet.go @@ -6365,10 +6362,10 @@ index 48e95ab7..622ced66 100644 ) diff --git a/internal/register/providers.go b/internal/register/providers.go -index bda4b7cf..eb4bd9d2 100644 +index a7348498..834809ba 100644 --- a/internal/register/providers.go +++ b/internal/register/providers.go -@@ -15,31 +15,31 @@ +@@ -15,32 +15,32 @@ package register import ( @@ -6390,6 +6387,7 @@ index bda4b7cf..eb4bd9d2 100644 - _ "github.com/coreos/ignition/v2/internal/providers/metal" - _ "github.com/coreos/ignition/v2/internal/providers/nutanix" - _ "github.com/coreos/ignition/v2/internal/providers/openstack" +- _ "github.com/coreos/ignition/v2/internal/providers/oraclecloud" - _ "github.com/coreos/ignition/v2/internal/providers/packet" - _ "github.com/coreos/ignition/v2/internal/providers/powervs" - _ "github.com/coreos/ignition/v2/internal/providers/proxmoxve" @@ -6417,6 +6415,7 @@ index bda4b7cf..eb4bd9d2 100644 + _ "github.com/flatcar/ignition/v2/internal/providers/metal" + _ "github.com/flatcar/ignition/v2/internal/providers/nutanix" + _ "github.com/flatcar/ignition/v2/internal/providers/openstack" ++ _ "github.com/flatcar/ignition/v2/internal/providers/oraclecloud" + _ "github.com/flatcar/ignition/v2/internal/providers/packet" + _ "github.com/flatcar/ignition/v2/internal/providers/powervs" + _ "github.com/flatcar/ignition/v2/internal/providers/proxmoxve" @@ -6876,7 +6875,7 @@ index 5bda64c1..056aa259 100644 func init() { diff --git a/tests/positive/files/file.go b/tests/positive/files/file.go -index 0dd092e1..a83da3c1 100644 +index d99944a0..6998d346 100644 --- a/tests/positive/files/file.go +++ b/tests/positive/files/file.go @@ -15,8 +15,8 @@ @@ -6890,6 +6889,15 @@ index 0dd092e1..a83da3c1 100644 ) func init() { +@@ -559,7 +559,7 @@ func ApplyCustomFilePermissions() types.Test { + func ApplyCustomFilePermissionsBeforeBugfix() types.Test { + // This test is put here to ensure that we don't accidentally fix configs that were not working before the fix. + // Ensure all versions before the bugfix are still losing special bits. +- // See: https://github.com/coreos/ignition/issues/2042 ++ // See: https://github.com/flatcar/ignition/issues/2042 + name := "files.customperms.pre-#2042-fix" + in := types.GetBaseDisk() + out := types.GetBaseDisk() diff --git a/tests/positive/files/hash.go b/tests/positive/files/hash.go index 8faecff7..829b15e7 100644 --- a/tests/positive/files/hash.go @@ -7319,7 +7327,7 @@ index 34408293..24a0bc61 100644 func init() { diff --git a/tests/register/register.go b/tests/register/register.go -index e081b7f6..14d1816a 100644 +index 576a57ca..571a76db 100644 --- a/tests/register/register.go +++ b/tests/register/register.go @@ -16,14 +16,14 @@ package register @@ -7408,7 +7416,7 @@ index 0230cd16..a4d235a2 100644 ) diff --git a/tests/validator.go b/tests/validator.go -index d64957db..8e937208 100644 +index d407a695..7321f9dd 100644 --- a/tests/validator.go +++ b/tests/validator.go @@ -25,8 +25,8 @@ import ( @@ -7438,5 +7446,5 @@ index bec64866..ed027604 100644 var ( -- -2.45.3 +2.49.1 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 a8899eee047..e22b82e1f9d 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,4 +1,4 @@ -From 42358eaa661444c3d5d07c4b52f8879372adaacf Mon Sep 17 00:00:00 2001 +From a06550ff7294cde7367802b22f45b147a11d0324 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 @@ -2621,5 +2621,5 @@ index 00000000..e81f6bed + } +} -- -2.45.3 +2.49.1 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 55c3381e23e..51cd894c421 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,6 +1,6 @@ -From 99d75703026de8787b4bb83e77bd07d1f6d730b9 Mon Sep 17 00:00:00 2001 +From ee56f2df58941892c102869290a52450f9727f83 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Wed, 26 Mar 2025 15:10:08 +0100 +Date: Tue, 12 Aug 2025 15:10:05 +0200 Subject: [PATCH 03/20] mod: add flatcar/ignition@0.36.2 it's required for Ignition conversion. @@ -11,10 +11,10 @@ Signed-off-by: Mathieu Tortuyaux 1 file changed, 4 insertions(+) diff --git a/go.mod b/go.mod -index f94bbafa..2afaf4ae 100644 +index a34e8f5e..be20c337 100644 --- a/go.mod +++ b/go.mod -@@ -14,6 +14,7 @@ require ( +@@ -15,6 +15,7 @@ require ( github.com/coreos/go-semver v0.3.1 github.com/coreos/go-systemd/v22 v22.5.0 github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 @@ -22,26 +22,26 @@ index f94bbafa..2afaf4ae 100644 github.com/google/renameio/v2 v2.0.0 github.com/google/uuid v1.6.0 github.com/mdlayher/vsock v1.2.1 -@@ -43,9 +44,11 @@ require ( - github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect +@@ -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 + github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect + github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // 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/envoyproxy/go-control-plane/envoy v1.32.4 // indirect github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect -@@ -75,6 +78,7 @@ require ( - go.opentelemetry.io/otel/sdk v1.34.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect - go.opentelemetry.io/otel/trace v1.34.0 // 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 + go4.org v0.0.0-20160314031811-03efcb870d84 // indirect - golang.org/x/crypto v0.36.0 // indirect - golang.org/x/sync v0.12.0 // indirect - golang.org/x/text v0.23.0 // 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 -- -2.45.3 +2.49.1 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 index 45ca40d3ba4..38c98896171 100644 --- 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 @@ -1,28 +1,28 @@ -From 09be40c8eaf6f045870ffb1044818e52dbcb73ef Mon Sep 17 00:00:00 2001 +From a407a17d3b18ac22dc17dd2f46f9023be93fda3c Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Wed, 26 Mar 2025 15:10:45 +0100 +Date: Tue, 12 Aug 2025 15:10:32 +0200 Subject: [PATCH 04/20] sum: go mod tidy Signed-off-by: Mathieu Tortuyaux --- - go.sum | 29 ++++++++++++++++++++++++++++- - 1 file changed, 28 insertions(+), 1 deletion(-) + go.sum | 35 ++++++++++++++++++++++++++++++++++- + 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/go.sum b/go.sum -index a67b17cd..b26853e1 100644 +index 0321edfb..ad66930d 100644 --- a/go.sum +++ b/go.sum -@@ -46,6 +46,9 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0 - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.1/go.mod h1:0wEl7vrAD8mehJyohS9HZy+WyEOaQO2mJx86Cvh93kM= - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 h1:8nn+rsCvTq9axyEh382S0PFLBeaFwNsT43IrPWzctRU= - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1/go.mod h1:viRWSEhtMZqz1rhwmOVKkWl6SwmVowfL9O2YR5gI2PE= +@@ -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.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk= - github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= - github.com/beevik/etree v1.5.0 h1:iaQZFSDS+3kYZiGoc9uKeOkUY3nYMXOKLl6KIJxiJWs= -@@ -61,8 +64,11 @@ github.com/containers/libhvee v0.10.0 h1:7VLv8keWZpHuGmWvyY4c1mVH5V1JYb1G78VC+8A + 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= @@ -34,26 +34,28 @@ index a67b17cd..b26853e1 100644 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= -@@ -86,11 +92,15 @@ github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfU +@@ -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= - github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +@@ -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.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= -@@ -132,10 +142,13 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.5 h1:VgzTY2jogw3xt39CusE - github.com/googleapis/enterprise-certificate-proxy v0.3.5/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA= - github.com/googleapis/gax-go/v2 v2.14.1 h1:hb0FFeiPaQskmvakKu5EbCbpntQn48jyHuvrkurSS/Q= - github.com/googleapis/gax-go/v2 v2.14.1/go.mod h1:Hb/NubMaVM88SrNkvl8X/o8XWwDJEPqouaLeN2IUxoA= + 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= @@ -61,10 +63,10 @@ index a67b17cd..b26853e1 100644 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.0-20231219164618-57a3676c3af6 h1:IsMZxCuZqKuao2vNdfD82fjjgPLfyHLpR41Z88viRWs= - github.com/keybase/go-keychain v0.0.0-20231219164618-57a3676c3af6/go.mod h1:3VeWNIJaW+O5xpRQbPp0Ybqu1vJd/pm7s2F473HRrkw= + 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= -@@ -152,6 +165,7 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1 +@@ -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= @@ -72,8 +74,8 @@ index a67b17cd..b26853e1 100644 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= -@@ -165,11 +179,16 @@ github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa - github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw= +@@ -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= @@ -82,14 +84,11 @@ index a67b17cd..b26853e1 100644 +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/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= - github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= - github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -@@ -177,8 +196,10 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf + 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= @@ -97,43 +96,42 @@ index a67b17cd..b26853e1 100644 github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3 h1:v6jG/tdl4O07LNVp74Nt7/OyL+1JsIW1M2f/nSvQheY= github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3/go.mod h1:CSBTxrhePCm0cmXNKDGeu+6bOQzpaEklfCqEpn89JWk= +github.com/vmware/vmw-ovflib v0.0.0-20170608004843-1f217b9dc714/go.mod h1:jiPk45kn7klhByRvUq5i2vo1RtHKBHj+iWGFpxbXuuI= - go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= - go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= + 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= -@@ -201,6 +222,8 @@ go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiy - go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ= - go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k= - go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE= +@@ -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.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= - golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= -@@ -213,6 +236,7 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r - golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= - golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= - golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++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.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= - golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= - golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c= -@@ -234,6 +258,7 @@ golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= - golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= - golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= - golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= + 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.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= - golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= - golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4= -@@ -242,6 +267,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm - golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= - golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= - golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= + 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= - golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= - golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= - google.golang.org/api v0.224.0 h1:Ir4UPtDsNiwIOHdExr3fAj4xZ42QjK7uQte3lORLJwU= -@@ -278,8 +304,9 @@ google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojt + 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= @@ -141,9 +139,9 @@ index a67b17cd..b26853e1 100644 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.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.45.3 +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 6fdd50ed59f..92aa7ae83b8 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,6 +1,6 @@ -From e36800fa55585c4db32a60b6c8c74bb0b3e4b17e Mon Sep 17 00:00:00 2001 +From c2f572be6f33034b1f810fd463a42d11e71e7168 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Wed, 26 Mar 2025 15:11:11 +0100 +Date: Tue, 12 Aug 2025 15:10:57 +0200 Subject: [PATCH 05/20] vendor: go mod vendor Signed-off-by: Mathieu Tortuyaux @@ -17029,20 +17029,20 @@ index 00000000..1b1efb0f + return +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index 888d509e..984b721c 100644 +index 1e5cbab2..3d3bae00 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt -@@ -128,6 +128,9 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric - # github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 - ## explicit; go 1.21 +@@ -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 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.6 + # github.com/aws/aws-sdk-go v1.55.7 ## explicit; go 1.19 github.com/aws/aws-sdk-go/aws -@@ -208,6 +211,9 @@ github.com/coreos/go-json +@@ -209,6 +212,9 @@ github.com/coreos/go-json # github.com/coreos/go-semver v0.3.1 ## explicit; go 1.8 github.com/coreos/go-semver/semver @@ -17052,7 +17052,7 @@ index 888d509e..984b721c 100644 # github.com/coreos/go-systemd/v22 v22.5.0 ## explicit; go 1.12 github.com/coreos/go-systemd/v22/dbus -@@ -269,6 +275,27 @@ github.com/envoyproxy/protoc-gen-validate/validate +@@ -270,6 +276,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 888d509e..984b721c 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-logr/logr v1.4.2 - ## explicit; go 1.18 - github.com/go-logr/logr -@@ -447,6 +474,9 @@ go.opentelemetry.io/otel/sdk/metric/metricdata - go.opentelemetry.io/otel/trace + # github.com/go-jose/go-jose/v4 v4.0.5 + ## explicit; go 1.21 + github.com/go-jose/go-jose/v4 +@@ -456,6 +483,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.36.0 + # golang.org/x/crypto v0.39.0 ## explicit; go 1.23.0 golang.org/x/crypto/chacha20 -- -2.45.3 +2.49.1 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/0006-config-v3_6-convert-ignition-2.x-to-3.x.patch index 8a49d35bc06..0ebd30af11a 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/0006-config-v3_6-convert-ignition-2.x-to-3.x.patch @@ -1,4 +1,4 @@ -From 0217fb3e21f9acff70ccaff3c0c6fa8a105df1d0 Mon Sep 17 00:00:00 2001 +From 1c451c17c202fa1a27888bfe76d192e077d13ab8 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 @@ -72,5 +72,5 @@ index 3be26cae..ea367663 100644 return Parse(raw) } -- -2.45.3 +2.49.1 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/0007-internal-prv-cmdline-backport-flatcar-patch.patch index 47c93c3e41d..8b1596a007c 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/0007-internal-prv-cmdline-backport-flatcar-patch.patch @@ -1,4 +1,4 @@ -From f82805de0aa6defb2f641facfb2fabf07cc1953a Mon Sep 17 00:00:00 2001 +From f84e3ffe1e864515a4552c457268db801277380d 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 @@ -36,5 +36,5 @@ index 30203bff..86a5cb79 100644 } -- -2.45.3 +2.49.1 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/0008-provider-qemu-apply-fw_cfg-patch.patch index 9479b8f099f..9ee7cd3855b 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/0008-provider-qemu-apply-fw_cfg-patch.patch @@ -1,4 +1,4 @@ -From bcc67f65dbcbe6d66d0fb8c96c1ee183585da6f9 Mon Sep 17 00:00:00 2001 +From e968bb45604b48e25815af7ce84baa46ec3cb221 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 @@ -159,5 +159,5 @@ index 389ec119..cab9c476 100644 + } -- -2.45.3 +2.49.1 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/0009-config-3_6-test-add-ignition-2.x-test-cases.patch index 15543133e61..bb20a46e3ed 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/0009-config-3_6-test-add-ignition-2.x-test-cases.patch @@ -1,4 +1,4 @@ -From c2c5e782e3e7d7c2a8699597059bac2614e698ed Mon Sep 17 00:00:00 2001 +From 158a17fe6da1c9e30f8d177e375a7424e19954b4 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 @@ -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.45.3 +2.49.1 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/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch index 547453b41e9..27d2c298d2c 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/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch @@ -1,4 +1,4 @@ -From 459ff2f9890250ae027aa50b96dac125f8ae8a65 Mon Sep 17 00:00:00 2001 +From d4cbad99a8dfce27c34d6373b49c50b3a2942bb3 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 @@ -35,5 +35,5 @@ index c575ced4..fefd1fff 100644 (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) -- -2.45.3 +2.49.1 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/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch index 35e369a41ba..ebe9de811a4 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/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch @@ -1,4 +1,4 @@ -From 67c775d6c1c7706ba1437c827e60c8f38544c1f8 Mon Sep 17 00:00:00 2001 +From d4896d39233152d8fb772fa509a7d02134980fe8 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 @@ -164,5 +164,5 @@ index 597c33fd..3680a4cd 100644 func delConfig(f *resource.Fetcher) error { -- -2.45.3 +2.49.1 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/0012-config-version-handle-configuration-version-1.patch index 0947fa01d53..824380f5c24 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/0012-config-version-handle-configuration-version-1.patch @@ -1,4 +1,4 @@ -From 2a7d30599956087db90b260dcb75fbc0762d95da Mon Sep 17 00:00:00 2001 +From 036b7ac1ccb58b628698e252e19009a8d6ee39e9 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 @@ -49,5 +49,5 @@ index 3b9bb22f..f81056fa 100644 return semver.Version{}, report.Report{}, errors.ErrInvalidVersion } -- -2.45.3 +2.49.1 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/0013-config-util-add-cloud-init-detection-to-initial-pars.patch index 5be34c81a3d..88dec28e0ec 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/0013-config-util-add-cloud-init-detection-to-initial-pars.patch @@ -1,4 +1,4 @@ -From fe115de47cff4745b46c0c045a51c3a66150c5f9 Mon Sep 17 00:00:00 2001 +From d888888eb3e6eaad7fba6b62e3245d25576a19b9 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 @@ -90,5 +90,5 @@ index 865d75d2..313d42ea 100644 if err == nil { return report.Report{}, nil -- -2.45.3 +2.49.1 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/0014-Revert-drop-OEM-URI-support.patch index d5e67bd8507..0ef696ab216 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/0014-Revert-drop-OEM-URI-support.patch @@ -1,4 +1,4 @@ -From 67b8b674471fc8bf16a9e65692b2cf13637f60d0 Mon Sep 17 00:00:00 2001 +From 70d0e48e5339081461a4a6815a07ee80e0d39310 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" @@ -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 d2434e2e..9e80ed2a 100644 +index 5f508761..b81beee0 100644 --- a/docs/supported-platforms.md +++ b/docs/supported-platforms.md @@ -12,6 +12,7 @@ Ignition is currently supported for the following platforms: @@ -271,5 +271,5 @@ index 354385fa..f7b855d8 100644 + ) +} -- -2.45.3 +2.49.1 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/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch index af20df21c25..a626bd2452a 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/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch @@ -1,4 +1,4 @@ -From 0ab0dca4211dc835bb9b7f4402f9e3c6ccb1dc46 Mon Sep 17 00:00:00 2001 +From 0b656bf09a53e721c6175e868dedf2904d3f15bc 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 @@ -35,5 +35,5 @@ index f7b855d8..e66707fd 100644 return nil -- -2.45.3 +2.49.1 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/0016-translation-support-OEM-and-oem.patch index 539336a49f2..10f18bf841f 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/0016-translation-support-OEM-and-oem.patch @@ -1,4 +1,4 @@ -From 5cf4125e598ce7f0ab02b4b8fb1ed3a810f05294 Mon Sep 17 00:00:00 2001 +From e03851847226e52f6a5eb2224fe9b32b2f4ca592 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 @@ -157,5 +157,5 @@ index e81f6bed..68c07109 100644 + } +} -- -2.45.3 +2.49.1 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/0017-revert-internal-oem-drop-noop-OEMs.patch index 6551dbdd716..79e8ad1bbdd 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/0017-revert-internal-oem-drop-noop-OEMs.patch @@ -1,4 +1,4 @@ -From 7ae88250e01d677abdc4a4755fd66984a6328c81 Mon Sep 17 00:00:00 2001 +From 198f62a4845d171bbdc73893715da2fb6b4df382 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 @@ -42,5 +42,5 @@ index 27c923d4..ae259f8f 100644 func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { -- -2.45.3 +2.49.1 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/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch index d7125e26457..122122327f1 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/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch @@ -1,4 +1,4 @@ -From d88e7af1759737d4b21adf38655312976587aeb6 Mon Sep 17 00:00:00 2001 +From 1e45cd2bea29d19cdce12c6708ae93b53a63e42f 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 @@ -10,7 +10,7 @@ Co-Authored-By: Krzesimir Nowak Date: Tue, 4 Apr 2023 12:12:42 +0200 Subject: [PATCH 19/20] /usr/share/oem -> /oem @@ -38,5 +38,5 @@ index 2726d705..c335eeee 100644 // Helper programs -- -2.45.3 +2.49.1 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/0020-internal-exec-stages-mount-Mount-oem.patch index 468cfef7d7d..4e8b3d0c11d 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/0020-internal-exec-stages-mount-Mount-oem.patch @@ -1,4 +1,4 @@ -From bcb802948375640e30beaca9eac1069426a63a8b Mon Sep 17 00:00:00 2001 +From a00ce4cd775722e87f97a529d4ff802f0d7f37c9 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 @@ -28,5 +28,5 @@ index bace4bbd..bc6767d2 100644 if err := checkForNonDirectories(path); err != nil { return err -- -2.45.3 +2.49.1 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.21.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.21.0-r1.ebuild deleted file mode 120000 index edd426c8cd1..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.21.0-r1.ebuild +++ /dev/null @@ -1 +0,0 @@ -ignition-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.22.0.ebuild similarity index 75% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.22.0.ebuild index 751fbc44141..f9e8fa41453 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.22.0.ebuild @@ -1,22 +1,14 @@ # Copyright (c) 2015 CoreOS, Inc.. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -EGIT_REPO_URI="https://github.com/coreos/ignition.git" -COREOS_GO_PACKAGE="github.com/flatcar/ignition/v2" -COREOS_GO_GO111MODULE="off" -inherit coreos-go git-r3 systemd udev +EAPI=8 +inherit go-module -if [[ "${PV}" == 9999 ]]; then - KEYWORDS="~amd64 ~arm64" -else - EGIT_COMMIT="fc324e12230b036ce9d44f64346780121431ff27" # v2.21.0 - KEYWORDS="amd64 arm64" -fi +KEYWORDS="amd64 arm64" DESCRIPTION="Pre-boot provisioning utility" HOMEPAGE="https://github.com/coreos/ignition" -SRC_URI="" +SRC_URI="https://github.com/coreos/ignition/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0/${PVR}" @@ -63,13 +55,13 @@ PATCHES=( ) src_compile() { - export GO15VENDOREXPERIMENT="1" - GO_LDFLAGS="-X github.com/flatcar/ignition/v2/internal/version.Raw=${PV} -X github.com/flatcar/ignition/v2/internal/distro.selinuxRelabel=false" || die - go_build "${COREOS_GO_PACKAGE}/internal" + 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 ${GOBIN}/internal ${PN} + newbin "${S}/main" "${PN}" dosym "/usr/bin/${PN}" "/usr/libexec/${PN}-rmcfg" }