From b8eda41726191af0c03b6bec66b4cb396e6d013d Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 25 May 2022 10:51:15 +0200 Subject: [PATCH 1/2] sys-apps/ignition: bump commit ID this pulls release 2.14.0 Signed-off-by: Mathieu Tortuyaux --- .../0001-sed-s-coreos-flatcar-linux.patch | 337 ++++++++---------- ...002-mod-add-ign-converter-dependency.patch | 36 +- .../ignition/files/0003-sum-go-mod-tidy.patch | 66 ++-- .../files/0004-vendor-go-mod-vendor.patch | 137 ++++--- ...v3_4-convert-ignition-2.x-to-3.4-exp.patch | 81 +++++ ...l-prv-cmdline-backport-flatcar-patch.patch | 40 +++ ...007-provider-qemu-apply-fw_cfg-patch.patch | 6 +- ...3_4-test-add-ignition-2.x-test-cases.patch | 6 +- ...-ignore-fs-format-mismatches-for-the.patch | 6 +- ...info.-.config.data-and-.config.url-v.patch | 65 ++-- ...rsion-handle-configuration-version-1.patch | 6 +- ...cloud-init-detection-to-initial-pars.patch | 6 +- .../0013-Revert-drop-OEM-URI-support.patch | 56 +-- ...e-url-support-btrfs-as-OEM-partition.patch | 10 +- ...stages-disks-prevent-races-with-udev.patch | 6 +- ...gn-converter-to-fix-link-translation.patch | 75 ---- .../files/0017-mod-update-ign-converter.patch | 181 ---------- ....0-r1.ebuild => ignition-2.14.0-r1.ebuild} | 0 sys-apps/ignition/ignition-9999.ebuild | 8 +- 19 files changed, 502 insertions(+), 626 deletions(-) create mode 100644 sys-apps/ignition/files/0005-config-v3_4-convert-ignition-2.x-to-3.4-exp.patch create mode 100644 sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patch.patch delete mode 100644 sys-apps/ignition/files/0016-update-ign-converter-to-fix-link-translation.patch delete mode 100644 sys-apps/ignition/files/0017-mod-update-ign-converter.patch rename sys-apps/ignition/{ignition-2.13.0-r1.ebuild => ignition-2.14.0-r1.ebuild} (100%) diff --git a/sys-apps/ignition/files/0001-sed-s-coreos-flatcar-linux.patch b/sys-apps/ignition/files/0001-sed-s-coreos-flatcar-linux.patch index b6d9f5c2264..c44a07f686c 100644 --- a/sys-apps/ignition/files/0001-sed-s-coreos-flatcar-linux.patch +++ b/sys-apps/ignition/files/0001-sed-s-coreos-flatcar-linux.patch @@ -1,18 +1,15 @@ -From ce14e51676e9379e35a93eaba51e4fced3cc6c37 Mon Sep 17 00:00:00 2001 +From 68f056c7c8d36234ca7fd5e6ad2eb55ed1f557e6 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Wed, 2 Mar 2022 15:24:14 +0100 -Subject: [PATCH 01/16] *: sed `s/coreos/flatcar-linux/` +Date: Wed, 25 May 2022 10:09:37 +0200 +Subject: [PATCH 01/15] *: sed `s/coreos/flatcar-linux/` Signed-off-by: Mathieu Tortuyaux --- - .github/workflows/go.yml | 2 +- build | 4 +- - build_blackbox_tests | 10 ++-- - build_for_container | 4 +- config/config.go | 4 +- config/config_test.go | 12 ++--- config/merge/merge.go | 6 +-- - config/merge/merge_test.go | 8 ++-- + config/merge/merge_test.go | 8 +-- config/shared/validations/unit.go | 2 +- config/translate/translate.go | 2 +- config/translate/translate_test.go | 4 +- @@ -46,7 +43,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_0/types/verification_test.go | 2 +- config/v3_1/config.go | 14 +++--- config/v3_1/config_test.go | 4 +- - config/v3_1/translate/translate.go | 8 ++-- + config/v3_1/translate/translate.go | 8 +-- config/v3_1/translate/translate_test.go | 4 +- config/v3_1/types/disk.go | 4 +- config/v3_1/types/file.go | 4 +- @@ -115,7 +112,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_2/types/verification_test.go | 2 +- config/v3_3/config.go | 14 +++--- config/v3_3/config_test.go | 4 +- - config/v3_3/translate/translate.go | 8 ++-- + config/v3_3/translate/translate.go | 8 +-- config/v3_3/translate/translate_test.go | 4 +- config/v3_3/types/clevis.go | 4 +- config/v3_3/types/clevis_test.go | 4 +- @@ -153,7 +150,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_3/types/verification_test.go | 2 +- config/v3_4_experimental/config.go | 14 +++--- config/v3_4_experimental/config_test.go | 4 +- - .../v3_4_experimental/translate/translate.go | 6 +-- + .../v3_4_experimental/translate/translate.go | 8 +-- .../translate/translate_test.go | 4 +- config/v3_4_experimental/types/clevis.go | 4 +- config/v3_4_experimental/types/clevis_test.go | 4 +- @@ -192,17 +189,17 @@ 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/exec/config_fetcher.go | 18 +++---- - internal/exec/engine.go | 24 +++++----- - internal/exec/stages/disks/disks.go | 16 +++---- - internal/exec/stages/disks/filesystems.go | 8 ++-- + internal/exec/engine.go | 24 ++++----- + internal/exec/stages/disks/disks.go | 16 +++--- + internal/exec/stages/disks/filesystems.go | 8 +-- internal/exec/stages/disks/luks.go | 10 ++-- - internal/exec/stages/disks/partitions.go | 8 ++-- + internal/exec/stages/disks/partitions.go | 8 +-- 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 +- @@ -211,21 +208,21 @@ Signed-off-by: Mathieu Tortuyaux 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 +++---- + 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 +- internal/exec/util/file.go | 10 ++-- - internal/exec/util/passwd.go | 8 ++-- + internal/exec/util/passwd.go | 8 +-- internal/exec/util/selinux.go | 2 +- - internal/exec/util/unit.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 | 30 ++++++------ - internal/platform/platform.go | 48 +++++++++---------- + internal/main.go | 30 +++++------ + internal/platform/platform.go | 50 +++++++++---------- internal/providers/aliyun/aliyun.go | 6 +-- internal/providers/aws/aws.go | 10 ++-- - internal/providers/azure/azure.go | 10 ++-- + internal/providers/azure/azure.go | 12 ++--- internal/providers/azurestack/azurestack.go | 6 +-- internal/providers/cloudstack/cloudstack.go | 14 +++--- internal/providers/cmdline/cmdline.go | 12 ++--- @@ -234,25 +231,26 @@ Signed-off-by: Mathieu Tortuyaux internal/providers/file/file.go | 6 +-- internal/providers/gcp/gcp.go | 6 +-- internal/providers/ibmcloud/ibmcloud.go | 12 ++--- + internal/providers/kubevirt/kubevirt.go | 12 ++--- internal/providers/noop/noop.go | 6 +-- internal/providers/nutanix/nutanix.go | 12 ++--- internal/providers/openstack/openstack.go | 14 +++--- internal/providers/packet/packet.go | 6 +-- internal/providers/powervs/powervs.go | 12 ++--- internal/providers/providers.go | 6 +-- - internal/providers/qemu/qemu_blockdev.go | 8 ++-- + internal/providers/qemu/qemu_blockdev.go | 8 +-- internal/providers/qemu/qemu_fwcfg.go | 6 +-- internal/providers/system/system.go | 14 +++--- internal/providers/util/config.go | 6 +-- - internal/providers/virtualbox/virtualbox.go | 8 ++-- - internal/providers/vmware/vmware_amd64.go | 10 ++-- + internal/providers/virtualbox/virtualbox.go | 8 +-- + internal/providers/vmware/vmware_amd64.go | 8 +-- .../providers/vmware/vmware_unsupported.go | 4 +- internal/providers/vultr/vultr.go | 6 +-- internal/providers/zvm/zvm.go | 12 ++--- internal/resource/http.go | 12 ++--- internal/resource/url.go | 6 +-- internal/resource/url_test.go | 6 +-- - internal/sgdisk/sgdisk.go | 8 ++-- + internal/sgdisk/sgdisk.go | 8 +-- internal/util/tools/docs/docs.go | 2 +- internal/util/verification.go | 2 +- internal/util/verification_test.go | 2 +- @@ -296,30 +294,17 @@ Signed-off-by: Mathieu Tortuyaux tests/positive/passwd/users.go | 4 +- tests/positive/proxy/http.go | 4 +- tests/positive/regression/filesystem.go | 4 +- - tests/positive/security/tls.go | 8 ++-- + tests/positive/security/tls.go | 8 +-- tests/positive/systemd/create_unit.go | 4 +- tests/positive/systemd/modify_service.go | 4 +- tests/positive/timeouts/timeouts.go | 4 +- tests/register/register.go | 12 ++--- - tests/registry/registry.go | 36 +++++++------- + tests/registry/registry.go | 36 ++++++------- tests/servers/servers.go | 2 +- tests/validator.go | 4 +- validate/main.go | 4 +- - 300 files changed, 812 insertions(+), 812 deletions(-) + 298 files changed, 813 insertions(+), 813 deletions(-) -diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml -index 0ed51319..851f6308 100644 ---- a/.github/workflows/go.yml -+++ b/.github/workflows/go.yml -@@ -48,7 +48,7 @@ jobs: - uses: actions/checkout@v2 - - name: Build ignition-validate - shell: bash -- run: go build -o ignition-validate github.com/coreos/ignition/v2/validate -+ run: go build -o ignition-validate github.com/flatcar-linux/ignition/v2/validate - - name: Test ignition-validate - shell: bash - run: | diff --git a/build b/build index dba50388..3fe7eb93 100755 --- a/build @@ -342,49 +327,6 @@ index dba50388..3fe7eb93 100755 eval $(go env) -diff --git a/build_blackbox_tests b/build_blackbox_tests -index 9b3dd5b7..a83e18c0 100755 ---- a/build_blackbox_tests -+++ b/build_blackbox_tests -@@ -6,11 +6,11 @@ set -eu - # tests will be run and where the stubs will be located, rely on the bb test caller setting up - # their PATH to include them. We don't need to include `id` because it gets copied into the - # system --GLDFLAGS="-X github.com/coreos/ignition/v2/internal/distro.useraddCmd=useradd-stub " --GLDFLAGS+="-X github.com/coreos/ignition/v2/internal/distro.usermodCmd=usermod-stub " --GLDFLAGS+="-X github.com/coreos/ignition/v2/internal/distro.userdelCmd=userdel-stub " --GLDFLAGS+="-X github.com/coreos/ignition/v2/internal/distro.groupdelCmd=groupdel-stub " --GLDFLAGS+="-X github.com/coreos/ignition/v2/internal/distro.blackboxTesting=true " -+GLDFLAGS="-X github.com/flatcar-linux/ignition/v2/internal/distro.useraddCmd=useradd-stub " -+GLDFLAGS+="-X github.com/flatcar-linux/ignition/v2/internal/distro.usermodCmd=usermod-stub " -+GLDFLAGS+="-X github.com/flatcar-linux/ignition/v2/internal/distro.userdelCmd=userdel-stub " -+GLDFLAGS+="-X github.com/flatcar-linux/ignition/v2/internal/distro.groupdelCmd=groupdel-stub " -+GLDFLAGS+="-X github.com/flatcar-linux/ignition/v2/internal/distro.blackboxTesting=true " - - . ./build - -diff --git a/build_for_container b/build_for_container -index 02514c23..4e279610 100755 ---- a/build_for_container -+++ b/build_for_container -@@ -3,7 +3,7 @@ - set -eu - - NAME="ignition" --ORG_PATH="github.com/coreos" -+ORG_PATH="github.com/flatcar-linux" - REPO_PATH="${ORG_PATH}/${NAME}/v2" - GLDFLAGS=${GLDFLAGS:-} - -@@ -12,7 +12,7 @@ if [ -z ${VERSION+a} ]; then - VERSION=$(git describe --dirty --always) - fi - --GLDFLAGS+="-X github.com/coreos/ignition/v2/internal/version.Raw=${VERSION}" -+GLDFLAGS+="-X github.com/flatcar-linux/ignition/v2/internal/version.Raw=${VERSION}" - - if [[ -n "$(git status -s)" ]]; then - echo "git repo not clean" diff --git a/config/config.go b/config/config.go index 3ded9022..578f7fc6 100644 --- a/config/config.go @@ -599,7 +541,7 @@ index bbb073ab..3137b652 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_0/types/file.go b/config/v3_0/types/file.go -index 26466ece..c0baf06b 100644 +index 5fa9ca8b..fee8d209 100644 --- a/config/v3_0/types/file.go +++ b/config/v3_0/types/file.go @@ -15,8 +15,8 @@ @@ -672,7 +614,7 @@ index 7a4d3cdb..c7297db5 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_0/types/mode.go b/config/v3_0/types/mode.go -index 7d23eb3e..e4f7f3f7 100644 +index 6021b915..2d2488ae 100644 --- a/config/v3_0/types/mode.go +++ b/config/v3_0/types/mode.go @@ -15,7 +15,7 @@ @@ -685,20 +627,20 @@ index 7d23eb3e..e4f7f3f7 100644 func validateMode(m *int) error { diff --git a/config/v3_0/types/mode_test.go b/config/v3_0/types/mode_test.go -index 771de41b..b4aa6edb 100644 +index addf4afa..87016c22 100644 --- a/config/v3_0/types/mode_test.go +++ b/config/v3_0/types/mode_test.go @@ -18,8 +18,8 @@ import ( - "reflect" + "fmt" "testing" - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" + "github.com/flatcar-linux/ignition/v2/config/shared/errors" + "github.com/flatcar-linux/ignition/v2/config/util" + "github.com/stretchr/testify/assert" ) - func TestModeValidate(t *testing.T) { diff --git a/config/v3_0/types/node.go b/config/v3_0/types/node.go index fb41f1f0..f030be40 100644 --- a/config/v3_0/types/node.go @@ -1023,7 +965,7 @@ index bbb073ab..3137b652 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_1/types/file.go b/config/v3_1/types/file.go -index d30ed3de..44f24583 100644 +index 97aa84a7..3e077700 100644 --- a/config/v3_1/types/file.go +++ b/config/v3_1/types/file.go @@ -15,8 +15,8 @@ @@ -1083,26 +1025,24 @@ index 94f6b0a2..294dc2ea 100644 func TestFilesystemValidateFormat(t *testing.T) { diff --git a/config/v3_1/types/headers.go b/config/v3_1/types/headers.go -index be1aadad..8bac0d63 100644 +index be1aadad..56835594 100644 --- a/config/v3_1/types/headers.go +++ b/config/v3_1/types/headers.go -@@ -17,9 +17,9 @@ package types +@@ -17,7 +17,7 @@ package types import ( "net/http" - "github.com/coreos/ignition/v2/config/shared/errors" ++ "github.com/flatcar-linux/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ) - - // Parse generates standard net/http headers from the data in HTTPHeaders diff --git a/config/v3_1/types/headers_test.go b/config/v3_1/types/headers_test.go -index 22546c60..eb97458d 100644 +index 40380b68..02682db1 100644 --- a/config/v3_1/types/headers_test.go +++ b/config/v3_1/types/headers_test.go -@@ -18,7 +18,7 @@ import ( - "strings" +@@ -17,7 +17,7 @@ package types + import ( "testing" - "github.com/coreos/ignition/v2/config/shared/errors" @@ -1124,7 +1064,7 @@ index 689b6093..c23e0ed6 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_1/types/mode.go b/config/v3_1/types/mode.go -index 7d23eb3e..e4f7f3f7 100644 +index 6021b915..2d2488ae 100644 --- a/config/v3_1/types/mode.go +++ b/config/v3_1/types/mode.go @@ -15,7 +15,7 @@ @@ -1137,20 +1077,20 @@ index 7d23eb3e..e4f7f3f7 100644 func validateMode(m *int) error { diff --git a/config/v3_1/types/mode_test.go b/config/v3_1/types/mode_test.go -index 771de41b..b4aa6edb 100644 +index addf4afa..87016c22 100644 --- a/config/v3_1/types/mode_test.go +++ b/config/v3_1/types/mode_test.go @@ -18,8 +18,8 @@ import ( - "reflect" + "fmt" "testing" - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" + "github.com/flatcar-linux/ignition/v2/config/shared/errors" + "github.com/flatcar-linux/ignition/v2/config/util" + "github.com/stretchr/testify/assert" ) - func TestModeValidate(t *testing.T) { diff --git a/config/v3_1/types/node.go b/config/v3_1/types/node.go index fb41f1f0..f030be40 100644 --- a/config/v3_1/types/node.go @@ -1529,7 +1469,7 @@ index 8caf8499..24c36547 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_2/types/file.go b/config/v3_2/types/file.go -index 9b71bb26..dafdf5af 100644 +index 4e7566bd..83345a31 100644 --- a/config/v3_2/types/file.go +++ b/config/v3_2/types/file.go @@ -15,8 +15,8 @@ @@ -1589,26 +1529,24 @@ index 1f8db903..3cab3146 100644 func TestFilesystemValidateFormat(t *testing.T) { diff --git a/config/v3_2/types/headers.go b/config/v3_2/types/headers.go -index be1aadad..8bac0d63 100644 +index be1aadad..56835594 100644 --- a/config/v3_2/types/headers.go +++ b/config/v3_2/types/headers.go -@@ -17,9 +17,9 @@ package types +@@ -17,7 +17,7 @@ package types import ( "net/http" - "github.com/coreos/ignition/v2/config/shared/errors" ++ "github.com/flatcar-linux/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ) - - // Parse generates standard net/http headers from the data in HTTPHeaders diff --git a/config/v3_2/types/headers_test.go b/config/v3_2/types/headers_test.go -index 22546c60..eb97458d 100644 +index 40380b68..02682db1 100644 --- a/config/v3_2/types/headers_test.go +++ b/config/v3_2/types/headers_test.go -@@ -18,7 +18,7 @@ import ( - "strings" +@@ -17,7 +17,7 @@ package types + import ( "testing" - "github.com/coreos/ignition/v2/config/shared/errors" @@ -1645,7 +1583,7 @@ index 123392b2..592d49b8 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_2/types/mode.go b/config/v3_2/types/mode.go -index 9eb7573d..5e57bb65 100644 +index ad3e51c2..4ebde9f0 100644 --- a/config/v3_2/types/mode.go +++ b/config/v3_2/types/mode.go @@ -15,7 +15,7 @@ @@ -1658,20 +1596,20 @@ index 9eb7573d..5e57bb65 100644 func validateMode(m *int) error { diff --git a/config/v3_2/types/mode_test.go b/config/v3_2/types/mode_test.go -index 8966e25d..be3777d4 100644 +index 53e37a6b..0dcb80d4 100644 --- a/config/v3_2/types/mode_test.go +++ b/config/v3_2/types/mode_test.go @@ -18,8 +18,8 @@ import ( - "reflect" + "fmt" "testing" - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" + "github.com/flatcar-linux/ignition/v2/config/shared/errors" + "github.com/flatcar-linux/ignition/v2/config/util" + "github.com/stretchr/testify/assert" ) - func TestModeValidate(t *testing.T) { diff --git a/config/v3_2/types/node.go b/config/v3_2/types/node.go index 248276e7..e23730f2 100644 --- a/config/v3_2/types/node.go @@ -2084,7 +2022,7 @@ index 8caf8499..24c36547 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_3/types/file.go b/config/v3_3/types/file.go -index 9b71bb26..dafdf5af 100644 +index 4e7566bd..83345a31 100644 --- a/config/v3_3/types/file.go +++ b/config/v3_3/types/file.go @@ -15,8 +15,8 @@ @@ -2144,26 +2082,24 @@ index 1f8db903..3cab3146 100644 func TestFilesystemValidateFormat(t *testing.T) { diff --git a/config/v3_3/types/headers.go b/config/v3_3/types/headers.go -index be1aadad..8bac0d63 100644 +index be1aadad..56835594 100644 --- a/config/v3_3/types/headers.go +++ b/config/v3_3/types/headers.go -@@ -17,9 +17,9 @@ package types +@@ -17,7 +17,7 @@ package types import ( "net/http" - "github.com/coreos/ignition/v2/config/shared/errors" ++ "github.com/flatcar-linux/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ) - - // Parse generates standard net/http headers from the data in HTTPHeaders diff --git a/config/v3_3/types/headers_test.go b/config/v3_3/types/headers_test.go -index 22546c60..eb97458d 100644 +index 40380b68..02682db1 100644 --- a/config/v3_3/types/headers_test.go +++ b/config/v3_3/types/headers_test.go -@@ -18,7 +18,7 @@ import ( - "strings" +@@ -17,7 +17,7 @@ package types + import ( "testing" - "github.com/coreos/ignition/v2/config/shared/errors" @@ -2213,7 +2149,7 @@ index 90d72387..0d505e34 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_3/types/mode.go b/config/v3_3/types/mode.go -index 9eb7573d..5e57bb65 100644 +index ad3e51c2..4ebde9f0 100644 --- a/config/v3_3/types/mode.go +++ b/config/v3_3/types/mode.go @@ -15,7 +15,7 @@ @@ -2226,20 +2162,20 @@ index 9eb7573d..5e57bb65 100644 func validateMode(m *int) error { diff --git a/config/v3_3/types/mode_test.go b/config/v3_3/types/mode_test.go -index 8966e25d..be3777d4 100644 +index 53e37a6b..0dcb80d4 100644 --- a/config/v3_3/types/mode_test.go +++ b/config/v3_3/types/mode_test.go @@ -18,8 +18,8 @@ import ( - "reflect" + "fmt" "testing" - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" + "github.com/flatcar-linux/ignition/v2/config/shared/errors" + "github.com/flatcar-linux/ignition/v2/config/util" + "github.com/stretchr/testify/assert" ) - func TestModeValidate(t *testing.T) { diff --git a/config/v3_3/types/node.go b/config/v3_3/types/node.go index 248276e7..e23730f2 100644 --- a/config/v3_3/types/node.go @@ -2575,17 +2511,19 @@ index 97253860..7ff31ee8 100644 ) diff --git a/config/v3_4_experimental/translate/translate.go b/config/v3_4_experimental/translate/translate.go -index 5b39cae9..5b4fde3a 100644 +index 2539c8f4..1076cdba 100644 --- a/config/v3_4_experimental/translate/translate.go +++ b/config/v3_4_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_3/types" - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" + "github.com/flatcar-linux/ignition/v2/config/translate" ++ "github.com/flatcar-linux/ignition/v2/config/util" + old_types "github.com/flatcar-linux/ignition/v2/config/v3_3/types" + "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" ) @@ -2712,26 +2650,24 @@ index 1f8db903..3cab3146 100644 func TestFilesystemValidateFormat(t *testing.T) { diff --git a/config/v3_4_experimental/types/headers.go b/config/v3_4_experimental/types/headers.go -index be1aadad..8bac0d63 100644 +index be1aadad..56835594 100644 --- a/config/v3_4_experimental/types/headers.go +++ b/config/v3_4_experimental/types/headers.go -@@ -17,9 +17,9 @@ package types +@@ -17,7 +17,7 @@ package types import ( "net/http" - "github.com/coreos/ignition/v2/config/shared/errors" ++ "github.com/flatcar-linux/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ) - - // Parse generates standard net/http headers from the data in HTTPHeaders diff --git a/config/v3_4_experimental/types/headers_test.go b/config/v3_4_experimental/types/headers_test.go -index 22546c60..eb97458d 100644 +index 40380b68..02682db1 100644 --- a/config/v3_4_experimental/types/headers_test.go +++ b/config/v3_4_experimental/types/headers_test.go -@@ -18,7 +18,7 @@ import ( - "strings" +@@ -17,7 +17,7 @@ package types + import ( "testing" - "github.com/coreos/ignition/v2/config/shared/errors" @@ -3047,11 +2983,11 @@ index 3dc90540..494f210a 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_4_experimental/types/url.go b/config/v3_4_experimental/types/url.go -index 0d8771bf..bb90bdf9 100644 +index 3ca189da..f094cde8 100644 --- a/config/v3_4_experimental/types/url.go +++ b/config/v3_4_experimental/types/url.go -@@ -19,8 +19,8 @@ import ( - +@@ -21,8 +21,8 @@ import ( + "github.com/aws/aws-sdk-go/aws/arn" "github.com/vincent-petithory/dataurl" - "github.com/coreos/ignition/v2/config/shared/errors" @@ -3062,7 +2998,7 @@ index 0d8771bf..bb90bdf9 100644 func validateURL(s string) error { diff --git a/config/v3_4_experimental/types/url_test.go b/config/v3_4_experimental/types/url_test.go -index bfef261f..c371179f 100644 +index 1901b7af..a0f2268f 100644 --- a/config/v3_4_experimental/types/url_test.go +++ b/config/v3_4_experimental/types/url_test.go @@ -17,8 +17,8 @@ package types @@ -3131,7 +3067,7 @@ index 18eea933..2c85ef10 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/go.mod b/go.mod -index 8bacb111..5eba3e60 100644 +index 06d80e65..e5a47737 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ @@ -3182,7 +3118,7 @@ index d4ac38ff..049a65d5 100644 type Flags struct { diff --git a/internal/distro/distro.go b/internal/distro/distro.go -index 4096b04a..2b045ead 100644 +index 61ca87ae..0fe37f4a 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go @@ -20,7 +20,7 @@ import ( @@ -3224,7 +3160,7 @@ index 6d1b8cab..54a6aa57 100644 type ConfigFetcher struct { diff --git a/internal/exec/engine.go b/internal/exec/engine.go -index 2b8a4700..57b72168 100644 +index efe5dba2..2a9bbba3 100644 --- a/internal/exec/engine.go +++ b/internal/exec/engine.go @@ -24,18 +24,18 @@ import ( @@ -3427,7 +3363,7 @@ index 11f133ff..259f0d69 100644 "github.com/stretchr/testify/assert" ) diff --git a/internal/exec/stages/files/files.go b/internal/exec/stages/files/files.go -index 6e574531..5723028d 100644 +index 7d97df5f..de976b5d 100644 --- a/internal/exec/stages/files/files.go +++ b/internal/exec/stages/files/files.go @@ -19,13 +19,13 @@ import ( @@ -3467,7 +3403,7 @@ index 9428b883..f0cf4ef0 100644 func TestEntrySort(t *testing.T) { diff --git a/internal/exec/stages/files/filesystemEntries.go b/internal/exec/stages/files/filesystemEntries.go -index 56083bca..da98d7ae 100644 +index c61824ba..d7af2c85 100644 --- a/internal/exec/stages/files/filesystemEntries.go +++ b/internal/exec/stages/files/filesystemEntries.go @@ -25,11 +25,11 @@ import ( @@ -3487,7 +3423,7 @@ index 56083bca..da98d7ae 100644 "github.com/vincent-petithory/dataurl" ) -@@ -443,7 +443,7 @@ func (s stage) getOrderedCreationList(config types.Config) ([]filesystemEntry, e +@@ -444,7 +444,7 @@ func (s stage) getOrderedCreationList(config types.Config) ([]filesystemEntry, e // Append all the hard links to the list after sorting. This allows // Ignition to create hard links to files that are deeper than the hard @@ -3668,12 +3604,12 @@ index 92db9026..a9fc6b64 100644 const ( diff --git a/internal/exec/util/file.go b/internal/exec/util/file.go -index fe56087a..46a74054 100644 +index d5a680d4..de46f9d6 100644 --- a/internal/exec/util/file.go +++ b/internal/exec/util/file.go -@@ -26,11 +26,11 @@ import ( - "path/filepath" +@@ -27,11 +27,11 @@ import ( "strconv" + "syscall" - cutil "github.com/coreos/ignition/v2/config/util" - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" @@ -3689,7 +3625,7 @@ index fe56087a..46a74054 100644 "golang.org/x/sys/unix" ) diff --git a/internal/exec/util/passwd.go b/internal/exec/util/passwd.go -index 267ed861..9a1f1883 100644 +index e6050d04..713dacb9 100644 --- a/internal/exec/util/passwd.go +++ b/internal/exec/util/passwd.go @@ -24,10 +24,10 @@ import ( @@ -3721,15 +3657,17 @@ index a274eae6..25eb17f1 100644 const ( diff --git a/internal/exec/util/unit.go b/internal/exec/util/unit.go -index 01321cfa..44ce20d5 100644 +index d42c51ad..20afc279 100644 --- a/internal/exec/util/unit.go +++ b/internal/exec/util/unit.go -@@ -21,7 +21,7 @@ import ( +@@ -22,8 +22,8 @@ import ( "path/filepath" "syscall" - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" +- "github.com/coreos/ignition/v2/internal/distro" + "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar-linux/ignition/v2/internal/distro" "github.com/vincent-petithory/dataurl" ) @@ -3764,7 +3702,7 @@ index 4a81f776..ebe7e00c 100644 // Util encapsulates logging and destdir indirection for the util methods. diff --git a/internal/main.go b/internal/main.go -index 10d66a1f..d82b5e46 100644 +index 809a92b5..b87c6293 100644 --- a/internal/main.go +++ b/internal/main.go @@ -22,21 +22,21 @@ import ( @@ -3805,11 +3743,11 @@ index 10d66a1f..d82b5e46 100644 ) diff --git a/internal/platform/platform.go b/internal/platform/platform.go -index bd393e6a..00c2c061 100644 +index 23339439..f7c59b7f 100644 --- a/internal/platform/platform.go +++ b/internal/platform/platform.go -@@ -17,30 +17,30 @@ package platform - import ( +@@ -18,31 +18,31 @@ import ( + "errors" "fmt" - "github.com/coreos/ignition/v2/internal/log" @@ -3824,6 +3762,7 @@ index bd393e6a..00c2c061 100644 - "github.com/coreos/ignition/v2/internal/providers/file" - "github.com/coreos/ignition/v2/internal/providers/gcp" - "github.com/coreos/ignition/v2/internal/providers/ibmcloud" +- "github.com/coreos/ignition/v2/internal/providers/kubevirt" - "github.com/coreos/ignition/v2/internal/providers/noop" - "github.com/coreos/ignition/v2/internal/providers/nutanix" - "github.com/coreos/ignition/v2/internal/providers/openstack" @@ -3848,6 +3787,7 @@ index bd393e6a..00c2c061 100644 + "github.com/flatcar-linux/ignition/v2/internal/providers/file" + "github.com/flatcar-linux/ignition/v2/internal/providers/gcp" + "github.com/flatcar-linux/ignition/v2/internal/providers/ibmcloud" ++ "github.com/flatcar-linux/ignition/v2/internal/providers/kubevirt" + "github.com/flatcar-linux/ignition/v2/internal/providers/noop" + "github.com/flatcar-linux/ignition/v2/internal/providers/nutanix" + "github.com/flatcar-linux/ignition/v2/internal/providers/openstack" @@ -3862,7 +3802,7 @@ index bd393e6a..00c2c061 100644 + "github.com/flatcar-linux/ignition/v2/internal/resource" ) - // Config represents a set of options that map to a particular platform. + var ( diff --git a/internal/providers/aliyun/aliyun.go b/internal/providers/aliyun/aliyun.go index 2da29f86..145a6cee 100644 --- a/internal/providers/aliyun/aliyun.go @@ -3909,18 +3849,20 @@ index b2385ac8..28157e60 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 178362fe..a98b1f17 100644 +index 7948e7fe..2f3374c0 100644 --- a/internal/providers/azure/azure.go +++ b/internal/providers/azure/azure.go -@@ -23,11 +23,11 @@ import ( +@@ -26,12 +26,12 @@ import ( "path/filepath" "time" +- "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - execUtil "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" ++ "github.com/flatcar-linux/ignition/v2/config/shared/errors" + "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" + execUtil "github.com/flatcar-linux/ignition/v2/internal/exec/util" + "github.com/flatcar-linux/ignition/v2/internal/log" @@ -3930,23 +3872,22 @@ index 178362fe..a98b1f17 100644 "github.com/coreos/vcontext/report" "golang.org/x/sys/unix" diff --git a/internal/providers/azurestack/azurestack.go b/internal/providers/azurestack/azurestack.go -index 10da8d23..3db21ca9 100644 +index 10da8d23..4d815569 100644 --- a/internal/providers/azurestack/azurestack.go +++ b/internal/providers/azurestack/azurestack.go -@@ -18,10 +18,10 @@ +@@ -18,9 +18,9 @@ package azurestack import ( - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/providers/azure" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/vcontext/report" + "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" + "github.com/flatcar-linux/ignition/v2/internal/providers/azure" + "github.com/flatcar-linux/ignition/v2/internal/resource" + "github.com/coreos/vcontext/report" ) - // These constants are the types of CDROM filesystems that might diff --git a/internal/providers/cloudstack/cloudstack.go b/internal/providers/cloudstack/cloudstack.go index 4e94faef..1a0aa048 100644 --- a/internal/providers/cloudstack/cloudstack.go @@ -4078,6 +4019,29 @@ index 83bb8952..787ef659 100644 "path/filepath" "time" +- "github.com/coreos/ignition/v2/config/v3_4_experimental/types" +- "github.com/coreos/ignition/v2/internal/distro" +- "github.com/coreos/ignition/v2/internal/log" +- "github.com/coreos/ignition/v2/internal/providers/util" +- "github.com/coreos/ignition/v2/internal/resource" +- ut "github.com/coreos/ignition/v2/internal/util" ++ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar-linux/ignition/v2/internal/distro" ++ "github.com/flatcar-linux/ignition/v2/internal/log" ++ "github.com/flatcar-linux/ignition/v2/internal/providers/util" ++ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ ut "github.com/flatcar-linux/ignition/v2/internal/util" + + "github.com/coreos/vcontext/report" + ) +diff --git a/internal/providers/kubevirt/kubevirt.go b/internal/providers/kubevirt/kubevirt.go +index ca7ef67b..a3132bfe 100644 +--- a/internal/providers/kubevirt/kubevirt.go ++++ b/internal/providers/kubevirt/kubevirt.go +@@ -26,12 +26,12 @@ import ( + "path/filepath" + "time" + - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" @@ -4206,7 +4170,7 @@ index fe41ec95..578b6d38 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/providers.go b/internal/providers/providers.go -index 3e02fb2d..7b431ca4 100644 +index daa80bfb..0bcbd712 100644 --- a/internal/providers/providers.go +++ b/internal/providers/providers.go @@ -17,9 +17,9 @@ package providers @@ -4301,7 +4265,7 @@ index 59e4f9b8..c767f5e5 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/virtualbox/virtualbox.go b/internal/providers/virtualbox/virtualbox.go -index 3e982db0..ff921abe 100644 +index e37304c0..dde19316 100644 --- a/internal/providers/virtualbox/virtualbox.go +++ b/internal/providers/virtualbox/virtualbox.go @@ -31,10 +31,10 @@ import ( @@ -4320,13 +4284,13 @@ index 3e982db0..ff921abe 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/vmware/vmware_amd64.go b/internal/providers/vmware/vmware_amd64.go -index b4ad39a7..c9930112 100644 +index 186ec97d..66ff5490 100644 --- a/internal/providers/vmware/vmware_amd64.go +++ b/internal/providers/vmware/vmware_amd64.go -@@ -18,15 +18,15 @@ - package vmware - +@@ -20,10 +20,10 @@ package vmware import ( + "fmt" + - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/providers" - "github.com/coreos/ignition/v2/internal/providers/util" @@ -4338,14 +4302,8 @@ index b4ad39a7..c9930112 100644 "github.com/coreos/vcontext/report" "github.com/vmware/vmw-guestinfo/rpcvmx" - "github.com/vmware/vmw-guestinfo/vmcheck" -- "github.com/vmware/vmw-ovflib" -+ ovf "github.com/vmware/vmw-ovflib" - ) - - func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { diff --git a/internal/providers/vmware/vmware_unsupported.go b/internal/providers/vmware/vmware_unsupported.go -index 72d0c082..fae52268 100644 +index e9e26cca..bf0e346f 100644 --- a/internal/providers/vmware/vmware_unsupported.go +++ b/internal/providers/vmware/vmware_unsupported.go @@ -23,8 +23,8 @@ package vmware @@ -4377,10 +4335,10 @@ index e691d20b..9bb01c30 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/zvm/zvm.go b/internal/providers/zvm/zvm.go -index d8a743c6..e7542bdc 100644 +index d8a743c6..25affe3e 100644 --- a/internal/providers/zvm/zvm.go +++ b/internal/providers/zvm/zvm.go -@@ -24,13 +24,13 @@ import ( +@@ -24,12 +24,12 @@ import ( "os/exec" "strings" @@ -4390,16 +4348,15 @@ index d8a743c6..e7542bdc 100644 - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/vcontext/report" + "github.com/flatcar-linux/ignition/v2/config/shared/errors" + "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" + "github.com/flatcar-linux/ignition/v2/internal/distro" + "github.com/flatcar-linux/ignition/v2/internal/log" + "github.com/flatcar-linux/ignition/v2/internal/providers/util" + "github.com/flatcar-linux/ignition/v2/internal/resource" + "github.com/coreos/vcontext/report" ) - const readerDevice string = "000c" diff --git a/internal/resource/http.go b/internal/resource/http.go index 471349a1..9f1d3667 100644 --- a/internal/resource/http.go @@ -4424,7 +4381,7 @@ index 471349a1..9f1d3667 100644 "github.com/vincent-petithory/dataurl" diff --git a/internal/resource/url.go b/internal/resource/url.go -index 83423673..e0ba4045 100644 +index 2696b697..25993094 100644 --- a/internal/resource/url.go +++ b/internal/resource/url.go @@ -32,9 +32,9 @@ import ( @@ -4441,12 +4398,12 @@ index 83423673..e0ba4045 100644 "google.golang.org/api/option" diff --git a/internal/resource/url_test.go b/internal/resource/url_test.go -index 5701180d..a0087a20 100644 +index 77a39c93..e4241c4f 100644 --- a/internal/resource/url_test.go +++ b/internal/resource/url_test.go -@@ -21,9 +21,9 @@ import ( - "reflect" - "testing" +@@ -23,9 +23,9 @@ import ( + + "github.com/stretchr/testify/assert" - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/internal/log" @@ -4869,7 +4826,7 @@ index d1a8244e..3c9ee830 100644 func init() { diff --git a/tests/positive/files/units.go b/tests/positive/files/units.go -index e9d4a6f4..89890dc9 100644 +index b8974479..d67861d9 100644 --- a/tests/positive/files/units.go +++ b/tests/positive/files/units.go @@ -15,8 +15,8 @@ @@ -5320,5 +5277,5 @@ index 3ac03d7c..5edf143e 100644 var ( -- -2.34.1 +2.35.1 diff --git a/sys-apps/ignition/files/0002-mod-add-ign-converter-dependency.patch b/sys-apps/ignition/files/0002-mod-add-ign-converter-dependency.patch index 19f3a9fc4c7..40c9753b884 100644 --- a/sys-apps/ignition/files/0002-mod-add-ign-converter-dependency.patch +++ b/sys-apps/ignition/files/0002-mod-add-ign-converter-dependency.patch @@ -1,40 +1,36 @@ -From 47ac5e73e9e62727850807c1184439a61303cbf4 Mon Sep 17 00:00:00 2001 -From: Mathieu Tortuyaux -Date: Tue, 27 Jul 2021 11:46:15 +0200 -Subject: [PATCH 02/16] mod: add ign-converter dependency +From c3e6b575bdb267c3500e95934f83247ccc7792dc Mon Sep 17 00:00:00 2001 +From: Mathieu Tortuyaux +Date: Wed, 25 May 2022 10:10:45 +0200 +Subject: [PATCH 02/15] mod: add ign-converter dependency -Signed-off-by: Mathieu Tortuyaux +Signed-off-by: Mathieu Tortuyaux --- - go.mod | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) + go.mod | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/go.mod b/go.mod -index 5eba3e60..e62b24af 100644 +index e5a47737..9b5da9f3 100644 --- a/go.mod +++ b/go.mod -@@ -9,20 +9,18 @@ require ( +@@ -10,6 +10,8 @@ require ( github.com/coreos/go-semver v0.3.0 github.com/coreos/go-systemd/v22 v22.0.0 github.com/coreos/vcontext v0.0.0-20211021162308-f1dbbca7bef4 -+ github.com/flatcar-linux/ign-converter v0.1.0 ++ github.com/flatcar-linux/ign-converter v0.2.0 + github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba github.com/google/renameio v0.1.0 github.com/google/uuid v1.1.1 github.com/pin/tftp v2.1.0+incompatible -- github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa // indirect - github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace - github.com/stretchr/testify v1.7.0 - github.com/vincent-petithory/dataurl v1.0.0 - github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728 - github.com/vmware/vmw-ovflib v0.0.0-20170608004843-1f217b9dc714 -- go.opencensus.io v0.22.5 // indirect +@@ -21,7 +23,9 @@ require ( golang.org/x/net v0.0.0-20200602114024-627f9648deb9 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/sys v0.0.0-20200610111108-226ff32320da -- golang.org/x/tools v0.0.0-20200610160956-3e83d1e96d0e // indirect ++ golang.org/x/text v0.3.7 // indirect + golang.org/x/tools v0.0.0-20200610160956-3e83d1e96d0e // indirect google.golang.org/api v0.26.0 -- google.golang.org/genproto v0.0.0-20200610104632-a5b850bcf112 // indirect + google.golang.org/genproto v0.0.0-20200610104632-a5b850bcf112 // indirect ++ gopkg.in/yaml.v2 v2.4.0 // indirect ) -- -2.34.1 +2.35.1 diff --git a/sys-apps/ignition/files/0003-sum-go-mod-tidy.patch b/sys-apps/ignition/files/0003-sum-go-mod-tidy.patch index a4623477f4f..b85fec54079 100644 --- a/sys-apps/ignition/files/0003-sum-go-mod-tidy.patch +++ b/sys-apps/ignition/files/0003-sum-go-mod-tidy.patch @@ -1,18 +1,18 @@ -From 899d82d2a225e37451477921d0304d698bff7fa2 Mon Sep 17 00:00:00 2001 +From ebbe212122592250ae7a5d0d8a74b2e78f1cb787 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Wed, 10 Nov 2021 16:59:52 +0100 -Subject: [PATCH 03/16] sum: go mod tidy +Date: Wed, 25 May 2022 10:11:59 +0200 +Subject: [PATCH 03/15] sum: go mod tidy Signed-off-by: Mathieu Tortuyaux --- - go.sum | 40 +++++++++++++++++++++++++++++++++++----- - 1 file changed, 35 insertions(+), 5 deletions(-) + go.sum | 40 ++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/go.sum b/go.sum -index 3dccd8cb..95397b93 100644 +index 097b98c7..afe8e529 100644 --- a/go.sum +++ b/go.sum -@@ -38,18 +38,26 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7 +@@ -38,6 +38,10 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= @@ -22,7 +22,8 @@ index 3dccd8cb..95397b93 100644 +github.com/aws/aws-sdk-go v1.8.39/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k= github.com/aws/aws-sdk-go v1.30.28 h1:SaPM7dlmp7h3Lj1nJ4jdzOkTdom08+g20k7AU5heZYg= github.com/aws/aws-sdk-go v1.30.28/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= - github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= + github.com/beevik/etree v1.1.1-0.20200718192613-4a2f8b9d084c h1:uYq6BD31fkfeNKQmfLj7ODcEfkb5JLsKrXVSqgnfGg8= +@@ -46,12 +50,16 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -39,12 +40,12 @@ index 3dccd8cb..95397b93 100644 github.com/coreos/go-systemd/v22 v22.0.0 h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQamW5YV28= github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/vcontext v0.0.0-20211021162308-f1dbbca7bef4 h1:pfSsrvbjUFGINaPGy0mm2QKQKTdq7IcbUa+nQwsz2UM= -@@ -60,10 +68,18 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF +@@ -62,10 +70,18 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -+github.com/flatcar-linux/ign-converter v0.1.0 h1:vHEaCLUKcUZFLCO7+bVD4N/836i8oqKKJTAeybLxtos= -+github.com/flatcar-linux/ign-converter v0.1.0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y= ++github.com/flatcar-linux/ign-converter v0.2.0 h1:XAIP2LHgqwtkPmJmilKSblCj0tGCO86qCrnbO6jgPM8= ++github.com/flatcar-linux/ign-converter v0.2.0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y= +github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba h1:HiTCL7737Hi944kXfLN8ReGoJtAiibGIsCk3MGlYy9M= +github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba/go.mod h1:JzHCIdCu9dy0xtezyBit/aOY4QIlJ12UYU6nXNPnnRE= +github.com/flatcar-linux/ignition/v2 v2.2.1-0.20220302150437-ce14e51676e9/go.mod h1:n076OVuGbg6f+j3YYoxFCjRyMU2hxsx6Q4Gy0xwO7cM= @@ -58,7 +59,11 @@ index 3dccd8cb..95397b93 100644 github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -@@ -120,19 +136,22 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORR +@@ -117,20 +133,25 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ + github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= + github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= + github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= ++github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -68,9 +73,7 @@ index 3dccd8cb..95397b93 100644 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= --github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE= - github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= ++github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= @@ -82,24 +85,31 @@ index 3dccd8cb..95397b93 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/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -@@ -140,10 +159,14 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb +@@ -138,6 +159,12 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= --github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= +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 v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= --github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa h1:E+gaaifzi2xF65PbDmuKI3PhLWY6G5opMLniFq8vmXA= -+github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs= ++github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= - github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU= -+github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg= ++github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU= +github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM= github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace h1:9PNP1jnUjRhfmGMlkXHjYPishpcw4jpSt/V/xYY3FMA= github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -@@ -165,6 +188,9 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +@@ -147,8 +174,10 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc + github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= + 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/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= + github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= + go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +@@ -157,6 +186,9 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= @@ -109,7 +119,7 @@ index 3dccd8cb..95397b93 100644 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -@@ -206,6 +232,7 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73r +@@ -198,6 +230,7 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/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= @@ -117,7 +127,7 @@ index 3dccd8cb..95397b93 100644 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -@@ -269,8 +296,9 @@ golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fq +@@ -261,8 +294,9 @@ golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fq golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -128,7 +138,7 @@ index 3dccd8cb..95397b93 100644 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -@@ -280,6 +308,7 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3 +@@ -272,6 +306,7 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -136,7 +146,7 @@ index 3dccd8cb..95397b93 100644 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -@@ -394,8 +423,9 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 +@@ -386,8 +421,9 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= @@ -148,5 +158,5 @@ index 3dccd8cb..95397b93 100644 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -- -2.34.1 +2.35.1 diff --git a/sys-apps/ignition/files/0004-vendor-go-mod-vendor.patch b/sys-apps/ignition/files/0004-vendor-go-mod-vendor.patch index 1d254b6dd75..90abc6692d4 100644 --- a/sys-apps/ignition/files/0004-vendor-go-mod-vendor.patch +++ b/sys-apps/ignition/files/0004-vendor-go-mod-vendor.patch @@ -1,9 +1,9 @@ -From 16e52005b90121cbefda9cdc15a268e7eb3928a8 Mon Sep 17 00:00:00 2001 -From: Mathieu Tortuyaux -Date: Tue, 27 Jul 2021 11:45:30 +0200 -Subject: [PATCH 04/16] vendor: go mod vendor +From 1c516a5e817f586a2f57ca4b01306597c902cfe8 Mon Sep 17 00:00:00 2001 +From: Mathieu Tortuyaux +Date: Wed, 25 May 2022 10:12:15 +0200 +Subject: [PATCH 04/15] vendor: go mod vendor -Signed-off-by: Mathieu Tortuyaux +Signed-off-by: Mathieu Tortuyaux --- vendor/github.com/ajeddeloh/go-json/OWNERS | 19 + vendor/github.com/ajeddeloh/go-json/README | 10 + @@ -21,7 +21,7 @@ Signed-off-by: Mathieu Tortuyaux .../coreos/go-systemd/unit/option.go | 59 + .../coreos/go-systemd/unit/serialize.go | 75 + .../flatcar-linux/ign-converter/LICENSE | 202 + - .../translate/v24tov31/v24tov31.go | 639 ++ + .../translate/v24tov31/v24tov31.go | 688 ++ .../flatcar-linux/ign-converter/util/util.go | 166 + .../github.com/flatcar-linux/ignition/LICENSE | 202 + .../github.com/flatcar-linux/ignition/NOTICE | 5 + @@ -174,7 +174,7 @@ Signed-off-by: Mathieu Tortuyaux .../x/text/unicode/norm/tables13.0.0.go | 7761 +++++++++++++++++ .../x/text/unicode/norm/tables9.0.0.go | 1 + vendor/modules.txt | 38 +- - 169 files changed, 26836 insertions(+), 63 deletions(-) + 169 files changed, 26888 insertions(+), 60 deletions(-) create mode 100644 vendor/github.com/ajeddeloh/go-json/OWNERS create mode 100644 vendor/github.com/ajeddeloh/go-json/README create mode 100644 vendor/github.com/ajeddeloh/go-json/decode.go @@ -5239,10 +5239,10 @@ index 00000000..e06d2081 + diff --git a/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go b/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go new file mode 100644 -index 00000000..1e406ca2 +index 00000000..d10cd7c3 --- /dev/null +++ b/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go -@@ -0,0 +1,639 @@ +@@ -0,0 +1,688 @@ +// Copyright 2020 Red Hat, Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); @@ -5262,7 +5262,9 @@ index 00000000..1e406ca2 +import ( + "errors" + "fmt" ++ "net/url" + "path" ++ "path/filepath" + "reflect" + + old "github.com/flatcar-linux/ignition/config/v2_4/types" @@ -5283,10 +5285,6 @@ index 00000000..1e406ca2 + return fmt.Errorf("Invalid input config:\n%s", rpt.String()) + } + -+ if len(cfg.Networkd.Units) != 0 { -+ return util.UsesNetworkdError -+ } -+ + // check that all filesystems have a path + if fsMap == nil { + fsMap = map[string]string{} @@ -5384,6 +5382,10 @@ index 00000000..1e406ca2 + if err := Check2_4(cfg, fsMap); err != nil { + return types.Config{}, err + } ++ ++ files := translateFiles(cfg.Storage.Files, fsMap) ++ files = append(files, translateNetworkd(cfg.Networkd.Units, fsMap)...) ++ + res := types.Config{ + // Ignition section + Ignition: types.Ignition{ @@ -5419,7 +5421,7 @@ index 00000000..1e406ca2 + Disks: translateDisks(cfg.Storage.Disks), + Raid: translateRaid(cfg.Storage.Raid), + Filesystems: translateFilesystems(cfg.Storage.Filesystems, fsMap), -+ Files: translateFiles(cfg.Storage.Files, fsMap), ++ Files: files, + Directories: translateDirectories(cfg.Storage.Directories, fsMap), + Links: translateLinks(cfg.Storage.Links, fsMap), + }, @@ -5757,6 +5759,53 @@ index 00000000..1e406ca2 + return +} + ++func translateNetworkd(units []old.Networkdunit, m map[string]string) []types.File { ++ var ret []types.File ++ ++ for _, u := range units { ++ if u.Contents != "" { ++ file := types.File{ ++ Node: types.Node{ ++ // 2.x files are overwrite by default ++ Overwrite: util.BoolP(true), ++ }, ++ FileEmbedded1: types.FileEmbedded1{ ++ // Ignition default file permission ++ Mode: util.IntP(int(0644)), ++ }, ++ } ++ // path /etc/systemd/network is hardcoded in Ignition2.x codebase. ++ // TODO: customize this path at compilation time. ++ file.Node.Path = filepath.Join(m["root"], "/etc/systemd/network", u.Name) ++ ++ // URL encoding unit content to follow 'data' format - we could use base64 also. ++ file.FileEmbedded1.Contents.Source = util.StrPStrict("data:," + url.QueryEscape(u.Contents)) ++ ++ ret = append(ret, file) ++ } ++ ++ for _, d := range u.Dropins { ++ file := types.File{ ++ Node: types.Node{ ++ // 2.x files are overwrite by default ++ Overwrite: util.BoolP(true), ++ }, ++ FileEmbedded1: types.FileEmbedded1{ ++ // Ignition default file permission ++ Mode: util.IntP(int(0644)), ++ }, ++ } ++ ++ file.Node.Path = filepath.Join(m["root"], "/etc/systemd/network", string(u.Name)+".d", d.Name) ++ file.FileEmbedded1.Contents.Source = util.StrPStrict("data:," + url.QueryEscape(d.Contents)) ++ ++ ret = append(ret, file) ++ } ++ } ++ ++ return ret ++} ++ +func translateLinks(links []old.Link, m map[string]string) (ret []types.Link) { + for _, l := range links { + ret = append(ret, types.Link{ @@ -5884,7 +5933,7 @@ index 00000000..1e406ca2 +} diff --git a/vendor/github.com/flatcar-linux/ign-converter/util/util.go b/vendor/github.com/flatcar-linux/ign-converter/util/util.go new file mode 100644 -index 00000000..40eb0971 +index 00000000..347d148c --- /dev/null +++ b/vendor/github.com/flatcar-linux/ign-converter/util/util.go @@ -0,0 +1,166 @@ @@ -5905,7 +5954,6 @@ index 00000000..40eb0971 +package util + +import ( -+ "errors" + "fmt" + "strconv" + "strings" @@ -5914,9 +5962,6 @@ index 00000000..40eb0971 + +// Error definitions + -+// UsesNetworkdError is the error for including networkd configs -+var UsesNetworkdError = errors.New("config includes deprecated networkd section - use Files instead") -+ +// NoFilesystemError type for when a filesystem is referenced in a config but there's no mapping to where +// it should be mounted (i.e. `path` in v3+ configs) +type NoFilesystemError string @@ -5968,7 +6013,11 @@ index 00000000..40eb0971 + +func CheckPathUsesLink(links []string, path string) string { + for _, l := range links { -+ if strings.HasPrefix(path, l) && path != l { ++ linkdir := l ++ if !strings.HasSuffix(l, "/") { ++ linkdir += "/" ++ } ++ if strings.HasPrefix(path, linkdir) && path != l { + return l + } + } @@ -28425,7 +28474,7 @@ index 94290692..0175eae5 100644 package norm diff --git a/vendor/modules.txt b/vendor/modules.txt -index 7a9a7d8b..8a5d8ec6 100644 +index 34bc6c6e..71ec1839 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -12,6 +12,8 @@ cloud.google.com/go/internal/version @@ -28437,7 +28486,7 @@ index 7a9a7d8b..8a5d8ec6 100644 # github.com/aws/aws-sdk-go v1.30.28 ## explicit github.com/aws/aws-sdk-go/aws -@@ -63,6 +65,8 @@ github.com/coreos/go-json +@@ -66,6 +68,8 @@ github.com/coreos/go-json # github.com/coreos/go-semver v0.3.0 ## explicit github.com/coreos/go-semver/semver @@ -28446,11 +28495,11 @@ index 7a9a7d8b..8a5d8ec6 100644 # github.com/coreos/go-systemd/v22 v22.0.0 ## explicit github.com/coreos/go-systemd/v22/dbus -@@ -77,6 +81,31 @@ github.com/coreos/vcontext/tree +@@ -80,6 +84,31 @@ github.com/coreos/vcontext/tree github.com/coreos/vcontext/validate # github.com/davecgh/go-spew v1.1.0 github.com/davecgh/go-spew/spew -+# github.com/flatcar-linux/ign-converter v0.1.0 ++# github.com/flatcar-linux/ign-converter v0.2.0 +## explicit +github.com/flatcar-linux/ign-converter/translate/v24tov31 +github.com/flatcar-linux/ign-converter/util @@ -28478,7 +28527,7 @@ index 7a9a7d8b..8a5d8ec6 100644 # github.com/godbus/dbus/v5 v5.0.3 github.com/godbus/dbus/v5 # github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e -@@ -110,8 +139,6 @@ github.com/pin/tftp +@@ -113,8 +142,6 @@ github.com/pin/tftp github.com/pin/tftp/netascii # github.com/pmezard/go-difflib v1.0.0 github.com/pmezard/go-difflib/difflib @@ -28487,15 +28536,7 @@ index 7a9a7d8b..8a5d8ec6 100644 # github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace ## explicit github.com/spf13/pflag -@@ -132,7 +159,6 @@ github.com/vmware/vmw-guestinfo/vmcheck - ## explicit - github.com/vmware/vmw-ovflib - # go.opencensus.io v0.22.5 --## explicit - go.opencensus.io - go.opencensus.io/internal - go.opencensus.io/internal/tagencoding -@@ -149,6 +175,8 @@ go.opencensus.io/trace +@@ -149,6 +176,8 @@ go.opencensus.io/trace go.opencensus.io/trace/internal go.opencensus.io/trace/propagation go.opencensus.io/trace/tracestate @@ -28504,29 +28545,25 @@ index 7a9a7d8b..8a5d8ec6 100644 # golang.org/x/lint v0.0.0-20200302205851-738671d3881b golang.org/x/lint golang.org/x/lint/golint -@@ -177,13 +205,12 @@ golang.org/x/oauth2/jwt +@@ -177,7 +206,8 @@ golang.org/x/oauth2/jwt ## explicit golang.org/x/sys/internal/unsafeheader golang.org/x/sys/unix -# golang.org/x/text v0.3.3 +# golang.org/x/text v0.3.7 ++## explicit golang.org/x/text/secure/bidirule golang.org/x/text/transform golang.org/x/text/unicode/bidi - golang.org/x/text/unicode/norm - # golang.org/x/tools v0.0.0-20200610160956-3e83d1e96d0e --## explicit - golang.org/x/tools/cmd/goimports - golang.org/x/tools/go/analysis - golang.org/x/tools/go/analysis/passes/inspect -@@ -237,7 +264,6 @@ google.golang.org/appengine/internal/remote_api - google.golang.org/appengine/internal/urlfetch - google.golang.org/appengine/urlfetch - # google.golang.org/genproto v0.0.0-20200610104632-a5b850bcf112 --## explicit - google.golang.org/genproto/googleapis/api/annotations - google.golang.org/genproto/googleapis/iam/v1 - google.golang.org/genproto/googleapis/rpc/code +@@ -319,6 +349,8 @@ google.golang.org/protobuf/types/known/anypb + google.golang.org/protobuf/types/known/durationpb + google.golang.org/protobuf/types/known/timestamppb + google.golang.org/protobuf/types/pluginpb ++# gopkg.in/yaml.v2 v2.4.0 ++## explicit + # gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b + gopkg.in/yaml.v3 + # honnef.co/go/tools v0.0.1-2020.1.4 -- -2.34.1 +2.35.1 diff --git a/sys-apps/ignition/files/0005-config-v3_4-convert-ignition-2.x-to-3.4-exp.patch b/sys-apps/ignition/files/0005-config-v3_4-convert-ignition-2.x-to-3.4-exp.patch new file mode 100644 index 00000000000..9c66669487d --- /dev/null +++ b/sys-apps/ignition/files/0005-config-v3_4-convert-ignition-2.x-to-3.4-exp.patch @@ -0,0 +1,81 @@ +From 04bd109f4d6512c80bbd5b2fe0903de2a4dd1d80 Mon Sep 17 00:00:00 2001 +From: Mathieu Tortuyaux +Date: Wed, 25 May 2022 10:20:09 +0200 +Subject: [PATCH 05/15] config/v3_4: convert ignition 2.x to 3.4-exp + +if the version of ignition is 2.x we convert it to 3.4-exp using +ign-converter. + +it should support any 2.x version (or at the least the last 2 releases) + +Signed-off-by: Mathieu Tortuyaux +--- + config/v3_4_experimental/config.go | 38 ++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +diff --git a/config/v3_4_experimental/config.go b/config/v3_4_experimental/config.go +index 512fc9f0..b0375236 100644 +--- a/config/v3_4_experimental/config.go ++++ b/config/v3_4_experimental/config.go +@@ -15,6 +15,10 @@ + package v3_4_experimental + + import ( ++ "encoding/json" ++ "fmt" ++ ++ "github.com/flatcar-linux/ignition/config/v2_4" + "github.com/flatcar-linux/ignition/v2/config/merge" + "github.com/flatcar-linux/ignition/v2/config/shared/errors" + "github.com/flatcar-linux/ignition/v2/config/util" +@@ -25,6 +29,8 @@ import ( + + "github.com/coreos/go-semver/semver" + "github.com/coreos/vcontext/report" ++ ++ "github.com/flatcar-linux/ign-converter/translate/v24tov31" + ) + + func Merge(parent, child types.Config) types.Config { +@@ -67,6 +73,38 @@ func ParseCompatibleVersion(raw []byte) (types.Config, report.Report, error) { + return types.Config{}, rpt, err + } + ++ // if the version is 2.x or 1.x, we ++ // convert it to 3.1 ++ if version.Major != 3 { ++ // Parse should fallback on every 2.x supported version ++ cfg, _, err := v2_4.Parse(raw) ++ if err != nil || rpt.IsFatal() { ++ return types.Config{}, report.Report{}, fmt.Errorf("unable to parse 2.x ignition: %w", err) ++ } ++ ++ /* ++ map[string]string{} is required by the ign-converter ++ Ignition Spec 3 will mount filesystems at the mountpoint specified by path when running. ++ Filesystems no longer have the name field and files, links, and directories no longer specify the filesystem by name. ++ This means to translate filesystems (with the exception of root), ++ you must also provide a mapping of filesystem name to absolute path, e.g. ++ ``` ++ map[string]string{"var": "/var"} ++ ``` ++ */ ++ newCfg, err := v24tov31.Translate(cfg, map[string]string{}) ++ if err != nil { ++ return types.Config{}, report.Report{}, fmt.Errorf("unable to translate 2.x ignition to 3.1: %w", err) ++ ++ } ++ ++ // update raw in place to continue with the 3.x logic ++ raw, err = json.Marshal(newCfg) ++ if err != nil { ++ return types.Config{}, report.Report{}, fmt.Errorf("unable to render JSON: %w", err) ++ } ++ } ++ + if version == types.MaxVersion { + return Parse(raw) + } +-- +2.35.1 + diff --git a/sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patch.patch b/sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patch.patch new file mode 100644 index 00000000000..bad25daada4 --- /dev/null +++ b/sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patch.patch @@ -0,0 +1,40 @@ +From 731c4c00c7056f4b3333ca0dbe25e0c3b348588a Mon Sep 17 00:00:00 2001 +From: Mathieu Tortuyaux +Date: Fri, 30 Jul 2021 14:21:31 +0200 +Subject: [PATCH 06/15] internal/prv/cmdline: backport flatcar patch + +this patch provides backward compatibility for various config +key + +Signed-off-by: Mathieu Tortuyaux +--- + internal/providers/cmdline/cmdline.go | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/internal/providers/cmdline/cmdline.go b/internal/providers/cmdline/cmdline.go +index 0068ed66..80b3af95 100644 +--- a/internal/providers/cmdline/cmdline.go ++++ b/internal/providers/cmdline/cmdline.go +@@ -33,7 +33,9 @@ import ( + ) + + const ( +- cmdlineUrlFlag = "ignition.config.url" ++ cmdlineUrlFlagLegacyCoreOS = "coreos.config.url" ++ cmdlineUrlFlagLegacy = "flatcar.config.url" ++ cmdlineUrlFlag = "ignition.config.url" + ) + + func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { +@@ -82,7 +84,7 @@ func parseCmdline(cmdline []byte) (url string) { + parts := strings.SplitN(strings.TrimSpace(arg), "=", 2) + key := parts[0] + +- if key != cmdlineUrlFlag { ++ if !(key == cmdlineUrlFlagLegacy || key == cmdlineUrlFlagLegacyCoreOS || key == cmdlineUrlFlag) { + continue + } + +-- +2.35.1 + diff --git a/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch b/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch index f824f49a3e3..904b7a3d662 100644 --- a/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch +++ b/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch @@ -1,7 +1,7 @@ -From 3cc31448bbe9624372e79c7d32f9cfe86bbb6251 Mon Sep 17 00:00:00 2001 +From b49c1ecc919a21ff90b71b6a0e67b15600157ad3 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Fri, 13 Aug 2021 11:47:01 +0200 -Subject: [PATCH 07/16] provider/qemu: apply fw_cfg patch +Subject: [PATCH 07/15] provider/qemu: apply fw_cfg patch we support both CoreOS and Flatcar fw_cfg path to ensure compatiblity @@ -164,5 +164,5 @@ index a4ebec6a..0ae9cd66 100644 + return types.Config{}, report.Report{}, iErrors.ErrEmpty } -- -2.34.1 +2.35.1 diff --git a/sys-apps/ignition/files/0008-config-3_4-test-add-ignition-2.x-test-cases.patch b/sys-apps/ignition/files/0008-config-3_4-test-add-ignition-2.x-test-cases.patch index f58ed6f6e91..15f82ada758 100644 --- a/sys-apps/ignition/files/0008-config-3_4-test-add-ignition-2.x-test-cases.patch +++ b/sys-apps/ignition/files/0008-config-3_4-test-add-ignition-2.x-test-cases.patch @@ -1,7 +1,7 @@ -From 172d2ddb9300f224f62b8d1900d7d459b26d7af8 Mon Sep 17 00:00:00 2001 +From c0105a1aeaf1650b74324457c364ac7e377d80a6 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 2 Sep 2021 11:03:17 +0200 -Subject: [PATCH 08/16] config/3_4/test: add ignition 2.x test cases +Subject: [PATCH 08/15] config/3_4/test: add ignition 2.x test cases Signed-off-by: Mathieu Tortuyaux --- @@ -40,5 +40,5 @@ index 7ff31ee8..224c277a 100644 in: in{config: []byte(`{"ignition": {"version": "3.0.0"}}`)}, out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}}, -- -2.34.1 +2.35.1 diff --git a/sys-apps/ignition/files/0009-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch b/sys-apps/ignition/files/0009-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch index c5ac1dfdc20..2686e15965d 100644 --- a/sys-apps/ignition/files/0009-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch +++ b/sys-apps/ignition/files/0009-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch @@ -1,7 +1,7 @@ -From c5e852249fd78bd7dcd33c833ef2dc4738759a2a Mon Sep 17 00:00:00 2001 +From 36a3efc8dfec1b06ee8df97ac87e08f9650cdd24 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 22 Sep 2021 14:53:49 +0200 -Subject: [PATCH 09/16] internal/disk/fs: ignore fs format mismatches for the +Subject: [PATCH 09/15] internal/disk/fs: ignore fs format mismatches for the OEM partition As soon as the OEM partition's filesystem format changes, all users @@ -35,5 +35,5 @@ index ef9028bf..dd251b28 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.34.1 +2.35.1 diff --git a/sys-apps/ignition/files/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch b/sys-apps/ignition/files/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch index 8c6a3e0efbe..8753402022d 100644 --- a/sys-apps/ignition/files/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch +++ b/sys-apps/ignition/files/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch @@ -1,8 +1,11 @@ -From b4e062a912db68e50f5db35bdb7704889a5aedc8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Kai=20L=C3=BCke?= -Date: Tue, 7 Apr 2020 17:36:35 +0200 -Subject: [PATCH 10/16] VMware: Fix guestinfo.*.config.data and *.config.url +From 840957aac96dee2c954fd821d14e7b41b3979dc7 Mon Sep 17 00:00:00 2001 +From: Mathieu Tortuyaux +Date: Wed, 25 May 2022 10:34:32 +0200 +Subject: [PATCH 10/15] VMware: Fix guestinfo.*.config.data and *.config.url variables +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit The decision whether to use ignition.config.data or coreos.config.data was based on their presence in ovfenv. If this was missing, coreos.config.data @@ -15,32 +18,35 @@ coreos.config.data but preferring ignition.config.data. The OVF metadata for CoreOS specified guestinfo.coreos.config.url but that was never used to fetch the Ignition config. Thus, use guestinfo.*.config.url as fallback if no guestinfo.*.config.data variables are set. + +Co-authored-by: Kai Lüke --- - internal/providers/vmware/vmware_amd64.go | 97 +++++++++++++++++------ - 1 file changed, 74 insertions(+), 23 deletions(-) + internal/providers/vmware/vmware_amd64.go | 96 +++++++++++++++++------ + 1 file changed, 74 insertions(+), 22 deletions(-) diff --git a/internal/providers/vmware/vmware_amd64.go b/internal/providers/vmware/vmware_amd64.go -index c9930112..5ddc18d0 100644 +index 66ff5490..327ad52b 100644 --- a/internal/providers/vmware/vmware_amd64.go +++ b/internal/providers/vmware/vmware_amd64.go -@@ -18,6 +18,8 @@ - package vmware +@@ -19,6 +19,7 @@ package vmware import ( + "fmt" + "net/url" -+ + "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" "github.com/flatcar-linux/ignition/v2/internal/providers" - "github.com/flatcar-linux/ignition/v2/internal/providers/util" -@@ -36,26 +38,83 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { +@@ -50,26 +51,85 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { return types.Config{}, report.Report{}, providers.ErrNoProvider } - config, err := fetchRawConfig(f) + config, err := fetchDataConfig(f) ++ + if err == nil && len(config) == 0 { + config, err = fetchUrlConfig(f) + } ++ if err != nil { return types.Config{}, report.Report{}, err } @@ -83,9 +89,8 @@ index c9930112..5ddc18d0 100644 - f.Logger.Debug("config successfully fetched") - return util.ParseConfig(f.Logger, decodedData) + return decodedData, nil - } - --func fetchRawConfig(f *resource.Fetcher) (config, error) { ++} ++ +func fetchUrlConfig(f *resource.Fetcher) ([]byte, error) { + rawUrl, err := getVariable(f, "ignition.config.url") + if err != nil || rawUrl == "" { @@ -113,51 +118,53 @@ index c9930112..5ddc18d0 100644 + } + + return data, nil -+} -+ + } + +-func fetchRawConfig(f *resource.Fetcher) (config, error) { +func getVariable(f *resource.Fetcher, key string) (string, error) { info := rpcvmx.NewConfig() var ovfData string - var ovfEncoding string - ovfEnv, err := info.String("ovfenv", "") + ovfEnv, err := info.String(GUESTINFO_OVF, "") if err != nil { -@@ -65,26 +124,18 @@ func fetchRawConfig(f *resource.Fetcher) (config, error) { - env, err := ovf.ReadEnvironment([]byte(ovfEnv)) +@@ -79,28 +139,20 @@ func fetchRawConfig(f *resource.Fetcher) (config, error) { + env, err := ReadOvfEnvironment([]byte(ovfEnv)) if err != nil { f.Logger.Warning("failed to parse OVF environment: %v. Continuing...", err) + } else { + ovfData = env.Properties["guestinfo."+key] } - -- ovfData = env.Properties["guestinfo.ignition.config.data"] -- ovfEncoding = env.Properties["guestinfo.ignition.config.data.encoding"] +- ovfData = env.Properties[OVF_USERDATA] +- ovfEncoding = env.Properties[OVF_USERDATA_ENCODING] - } - -- data, err := info.String("ignition.config.data", ovfData) +- data, err := info.String(GUESTINFO_USERDATA, ovfData) - if err != nil { - f.Logger.Debug("failed to fetch config: %v", err) - return config{}, err } -- encoding, err := info.String("ignition.config.data.encoding", ovfEncoding) +- encoding, err := info.String(GUESTINFO_USERDATA_ENCODING, ovfEncoding) + // The guest variables get preference over the ovfenv variables which are given here as fallback + data, err := info.String(key, ovfData) if err != nil { -- f.Logger.Debug("failed to fetch config encoding: %v", err) + f.Logger.Debug("failed to fetch config encoding: %v", err) - return config{}, err -+ f.Logger.Debug("failed to fetch variable, falling back to ovfenv value: %v", err) -+ return ovfData, nil ++ return ovfData, err } - return config{ - data: data, - encoding: encoding, - }, nil -+ // An empty string will be returned if nothing was found + return data, nil ++ } + + func DelConfig(f *resource.Fetcher) error { -- -2.34.1 +2.35.1 diff --git a/sys-apps/ignition/files/0011-config-version-handle-configuration-version-1.patch b/sys-apps/ignition/files/0011-config-version-handle-configuration-version-1.patch index 800c54927ef..c46fdb92c27 100644 --- a/sys-apps/ignition/files/0011-config-version-handle-configuration-version-1.patch +++ b/sys-apps/ignition/files/0011-config-version-handle-configuration-version-1.patch @@ -1,7 +1,7 @@ -From 2bf42df6ee0823c0d196270d486b448bdb051747 Mon Sep 17 00:00:00 2001 +From f36f9b24499b1c191538857a3f9faa97008db403 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 2 Feb 2022 13:27:18 +0100 -Subject: [PATCH 11/16] config/version: handle configuration version 1 +Subject: [PATCH 11/15] 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 9fb88d8e..89d815b8 100644 return semver.Version{}, report.Report{}, errors.ErrInvalidVersion } -- -2.34.1 +2.35.1 diff --git a/sys-apps/ignition/files/0012-config-util-add-cloud-init-detection-to-initial-pars.patch b/sys-apps/ignition/files/0012-config-util-add-cloud-init-detection-to-initial-pars.patch index 6fca4179f3a..cfdbd00d9ae 100644 --- a/sys-apps/ignition/files/0012-config-util-add-cloud-init-detection-to-initial-pars.patch +++ b/sys-apps/ignition/files/0012-config-util-add-cloud-init-detection-to-initial-pars.patch @@ -1,7 +1,7 @@ -From 3823328197a2dc801fc01dc368a32293ad463e4a Mon Sep 17 00:00:00 2001 +From 45c15e838db7ef17cf4ff391195eb4548b5b509e Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 22 Feb 2022 15:41:13 +0100 -Subject: [PATCH 12/16] config/util: add cloud init detection to initial +Subject: [PATCH 12/15] config/util: add cloud init detection to initial parsing we detect if the config is not an ignition one (script/cloudinit) and we @@ -75,5 +75,5 @@ index 5e2b4a2b..061a488d 100644 if err == nil { return report.Report{}, nil -- -2.34.1 +2.35.1 diff --git a/sys-apps/ignition/files/0013-Revert-drop-OEM-URI-support.patch b/sys-apps/ignition/files/0013-Revert-drop-OEM-URI-support.patch index 2f4f466463d..c0495b888f4 100644 --- a/sys-apps/ignition/files/0013-Revert-drop-OEM-URI-support.patch +++ b/sys-apps/ignition/files/0013-Revert-drop-OEM-URI-support.patch @@ -1,7 +1,7 @@ -From b06bfb4350ad4425d2badc849154fd01c534d23e Mon Sep 17 00:00:00 2001 +From c53d44fd2f59c9cefdc699d55007a92dbbd0f292 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Tue, 21 Sep 2021 11:32:23 +0200 -Subject: [PATCH 13/16] Revert "*: drop OEM URI support" +Date: Wed, 25 May 2022 10:38:16 +0200 +Subject: [PATCH 13/15] Revert "*: drop OEM URI support" This reverts commit 0c088d6de77aa1b1f47b9252a07f51cb1e249df3. --- @@ -73,10 +73,10 @@ index bb90bdf9..8f3da4d9 100644 case "s3": if v, ok := u.Query()["versionId"]; ok { diff --git a/config/v3_4_experimental/types/url.go b/config/v3_4_experimental/types/url.go -index bb90bdf9..8f3da4d9 100644 +index f094cde8..72b1b37b 100644 --- a/config/v3_4_experimental/types/url.go +++ b/config/v3_4_experimental/types/url.go -@@ -30,7 +30,7 @@ func validateURL(s string) error { +@@ -32,7 +32,7 @@ func validateURL(s string) error { } switch u.Scheme { @@ -86,7 +86,7 @@ index bb90bdf9..8f3da4d9 100644 case "s3": if v, ok := u.Query()["versionId"]; ok { diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md -index ee6a2025..cd51355a 100644 +index 9ecb590a..f7bb4b40 100644 --- a/docs/supported-platforms.md +++ b/docs/supported-platforms.md @@ -10,6 +10,7 @@ Ignition is currently only supported for the following platforms: @@ -98,7 +98,7 @@ index ee6a2025..cd51355a 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 2b045ead..22b0da0f 100644 +index 0fe37f4a..3afc587f 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go @@ -23,13 +23,17 @@ import ( @@ -119,8 +119,8 @@ index 2b045ead..22b0da0f 100644 + oemLookasideDir = "/usr/share/oem" // Helper programs - groupaddCmd = "groupadd" -@@ -78,11 +82,14 @@ var ( + groupaddCmd = "groupadd" +@@ -79,11 +83,14 @@ var ( resultFilePath = "/etc/.ignition-result.json" ) @@ -134,13 +134,13 @@ index 2b045ead..22b0da0f 100644 func SystemConfigDir() string { return fromEnv("SYSTEM_CONFIG_DIR", systemConfigDir) } +func OEMLookasideDir() string { return fromEnv("OEM_LOOKASIDE_DIR", oemLookasideDir) } - func GroupaddCmd() string { return groupaddCmd } - func GroupdelCmd() string { return groupdelCmd } + func GroupaddCmd() string { return groupaddCmd } + func GroupdelCmd() string { return groupdelCmd } diff --git a/internal/resource/url.go b/internal/resource/url.go -index e0ba4045..3e089276 100644 +index 25993094..8ed6efdb 100644 --- a/internal/resource/url.go +++ b/internal/resource/url.go -@@ -27,14 +27,20 @@ import ( +@@ -27,13 +27,17 @@ import ( "net/http" "net/url" "os" @@ -151,32 +151,38 @@ index e0ba4045..3e089276 100644 "cloud.google.com/go/compute/metadata" "cloud.google.com/go/storage" -+ configErrors "github.com/flatcar-linux/ignition/v2/config/shared/errors" + "github.com/flatcar-linux/ignition/v2/internal/distro" "github.com/flatcar-linux/ignition/v2/internal/log" + "github.com/flatcar-linux/ignition/v2/internal/systemd" "github.com/flatcar-linux/ignition/v2/internal/util" -+ "golang.org/x/oauth2/google" "google.golang.org/api/option" - -@@ -196,6 +202,8 @@ func (f *Fetcher) Fetch(u url.URL, dest *os.File, opts FetchOptions) error { +@@ -145,6 +149,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) ++ case "oem": ++ err = f.fetchFromOEM(u, dest, opts) + case "s3", "arn": + buf := &s3buf{ + WriteAtBuffer: aws.NewWriteAtBuffer([]byte{}), +@@ -206,6 +212,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) + case "oem": -+ return f.FetchFromOEM(u, dest, opts) - case "s3": ++ return f.fetchFromOEM(u, dest, opts) + case "s3", "arn": return f.fetchFromS3(u, dest, opts) case "gs": -@@ -381,6 +389,53 @@ type s3target interface { +@@ -396,6 +404,53 @@ type s3target interface { io.ReadSeeker } +// FetchFromOEM gets data off the oem partition as described by u and writes it +// into dest, returning an error if one is encountered. -+func (f *Fetcher) FetchFromOEM(u url.URL, dest *os.File, opts FetchOptions) error { ++func (f *Fetcher) fetchFromOEM(u url.URL, dest io.Writer, opts FetchOptions) error { + path := filepath.Clean(u.Path) + if !filepath.IsAbs(path) { + f.Logger.Err("oem path is not absolute: %q", u.Path) @@ -224,9 +230,9 @@ index e0ba4045..3e089276 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 -@@ -522,3 +577,39 @@ func (f *Fetcher) decompressCopyHashAndVerify(dest io.Writer, src io.Reader, opt - } - return nil +@@ -623,3 +678,39 @@ func (f *Fetcher) parseARN(arnURL string) (string, string, string, string, error + key := strings.Join(urlSplit[1:], "/") + return bucket, key, "", regionHint, nil } + +// mountOEM waits for the presence of and mounts the oem partition at @@ -499,5 +505,5 @@ index d5bd3fe7..ea4ff6ab 100644 Env []string // Environment variables for Ignition Config string -- -2.34.1 +2.35.1 diff --git a/sys-apps/ignition/files/0014-internal-resource-url-support-btrfs-as-OEM-partition.patch b/sys-apps/ignition/files/0014-internal-resource-url-support-btrfs-as-OEM-partition.patch index 63f10e04ac3..a0fb42105de 100644 --- a/sys-apps/ignition/files/0014-internal-resource-url-support-btrfs-as-OEM-partition.patch +++ b/sys-apps/ignition/files/0014-internal-resource-url-support-btrfs-as-OEM-partition.patch @@ -1,7 +1,7 @@ -From cdcfe0645eeb6609ba24f1c269621fad0347ef1f Mon Sep 17 00:00:00 2001 +From 9212d688c63fab92b2e9d808df04bf75ca86726d 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 14/16] internal/resource/url: support btrfs as OEM partition +Subject: [PATCH 14/15] 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 3e089276..993eeddf 100644 +index 8ed6efdb..d92cefac 100644 --- a/internal/resource/url.go +++ b/internal/resource/url.go -@@ -598,8 +598,17 @@ func (f *Fetcher) mountOEM(oemMountPath string) error { +@@ -699,8 +699,17 @@ func (f *Fetcher) mountOEM(oemMountPath string) error { }, "mounting %q at %q", distro.OEMDevicePath(), oemMountPath, ); err != nil { @@ -35,5 +35,5 @@ index 3e089276..993eeddf 100644 return nil -- -2.34.1 +2.35.1 diff --git a/sys-apps/ignition/files/0015-internal-exec-stages-disks-prevent-races-with-udev.patch b/sys-apps/ignition/files/0015-internal-exec-stages-disks-prevent-races-with-udev.patch index 7e7ea745027..15a86004988 100644 --- a/sys-apps/ignition/files/0015-internal-exec-stages-disks-prevent-races-with-udev.patch +++ b/sys-apps/ignition/files/0015-internal-exec-stages-disks-prevent-races-with-udev.patch @@ -1,7 +1,7 @@ -From 858ba5f5b7de3746b25564897c78e0c3d0ad4cea Mon Sep 17 00:00:00 2001 +From 02dcfeec54df967069efb330971e1a651753a58a Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Fri, 11 Feb 2022 15:41:12 +0100 -Subject: [PATCH 15/16] internal/exec/stages/disks: prevent races with udev +Subject: [PATCH 15/15] internal/exec/stages/disks: prevent races with udev The "udevadm settle" command used to wait for udev to process the disk changes and recreate the entries under /dev was still prone to races @@ -193,5 +193,5 @@ index dff93413..7840d8fc 100644 return nil -- -2.34.1 +2.35.1 diff --git a/sys-apps/ignition/files/0016-update-ign-converter-to-fix-link-translation.patch b/sys-apps/ignition/files/0016-update-ign-converter-to-fix-link-translation.patch deleted file mode 100644 index aee838b0bed..00000000000 --- a/sys-apps/ignition/files/0016-update-ign-converter-to-fix-link-translation.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 66a431d966352077f8ef04a675fb2a5878e72d85 Mon Sep 17 00:00:00 2001 -From: Kai Lueke -Date: Thu, 10 Mar 2022 18:12:23 +0100 -Subject: [PATCH 16/16] update ign-converter to fix link translation - -This pulls in -https://github.com/flatcar-linux/ign-converter/pull/5 ---- - go.mod | 2 +- - go.sum | 4 ++-- - vendor/github.com/flatcar-linux/ign-converter/util/util.go | 6 +++++- - vendor/modules.txt | 2 +- - 4 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/go.mod b/go.mod -index e62b24af..d2104235 100644 ---- a/go.mod -+++ b/go.mod -@@ -9,7 +9,7 @@ require ( - github.com/coreos/go-semver v0.3.0 - github.com/coreos/go-systemd/v22 v22.0.0 - github.com/coreos/vcontext v0.0.0-20211021162308-f1dbbca7bef4 -- github.com/flatcar-linux/ign-converter v0.1.0 -+ github.com/flatcar-linux/ign-converter v0.1.1-0.20220311112608-f121a881f370 - github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba - github.com/google/renameio v0.1.0 - github.com/google/uuid v1.1.1 -diff --git a/go.sum b/go.sum -index 95397b93..043cc197 100644 ---- a/go.sum -+++ b/go.sum -@@ -68,8 +68,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF - github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= - github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= - github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= --github.com/flatcar-linux/ign-converter v0.1.0 h1:vHEaCLUKcUZFLCO7+bVD4N/836i8oqKKJTAeybLxtos= --github.com/flatcar-linux/ign-converter v0.1.0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y= -+github.com/flatcar-linux/ign-converter v0.1.1-0.20220311112608-f121a881f370 h1:Xz78ZBjeHkvxFpXSV2ppTDW2+ZudsCnT7VXVvqR1pto= -+github.com/flatcar-linux/ign-converter v0.1.1-0.20220311112608-f121a881f370/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y= - github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba h1:HiTCL7737Hi944kXfLN8ReGoJtAiibGIsCk3MGlYy9M= - github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba/go.mod h1:JzHCIdCu9dy0xtezyBit/aOY4QIlJ12UYU6nXNPnnRE= - github.com/flatcar-linux/ignition/v2 v2.2.1-0.20220302150437-ce14e51676e9/go.mod h1:n076OVuGbg6f+j3YYoxFCjRyMU2hxsx6Q4Gy0xwO7cM= -diff --git a/vendor/github.com/flatcar-linux/ign-converter/util/util.go b/vendor/github.com/flatcar-linux/ign-converter/util/util.go -index 40eb0971..1968f472 100644 ---- a/vendor/github.com/flatcar-linux/ign-converter/util/util.go -+++ b/vendor/github.com/flatcar-linux/ign-converter/util/util.go -@@ -78,7 +78,11 @@ func (e DuplicateDropinError) Error() string { - - func CheckPathUsesLink(links []string, path string) string { - for _, l := range links { -- if strings.HasPrefix(path, l) && path != l { -+ linkdir := l -+ if !strings.HasSuffix(l, "/") { -+ linkdir += "/" -+ } -+ if strings.HasPrefix(path, linkdir) && path != l { - return l - } - } -diff --git a/vendor/modules.txt b/vendor/modules.txt -index 8a5d8ec6..bf99aa2d 100644 ---- a/vendor/modules.txt -+++ b/vendor/modules.txt -@@ -81,7 +81,7 @@ github.com/coreos/vcontext/tree - github.com/coreos/vcontext/validate - # github.com/davecgh/go-spew v1.1.0 - github.com/davecgh/go-spew/spew --# github.com/flatcar-linux/ign-converter v0.1.0 -+# github.com/flatcar-linux/ign-converter v0.1.1-0.20220311112608-f121a881f370 - ## explicit - github.com/flatcar-linux/ign-converter/translate/v24tov31 - github.com/flatcar-linux/ign-converter/util --- -2.34.1 - diff --git a/sys-apps/ignition/files/0017-mod-update-ign-converter.patch b/sys-apps/ignition/files/0017-mod-update-ign-converter.patch deleted file mode 100644 index 73a631cbc82..00000000000 --- a/sys-apps/ignition/files/0017-mod-update-ign-converter.patch +++ /dev/null @@ -1,181 +0,0 @@ -From ca57bcabeca517a657b398b2200f04a4a4c9d1ef Mon Sep 17 00:00:00 2001 -From: Mathieu Tortuyaux -Date: Thu, 19 May 2022 14:43:41 +0200 -Subject: [PATCH] mod: update ign-converter - -this pulls: https://github.com/flatcar-linux/ign-converter/pull/6 - -Signed-off-by: Mathieu Tortuyaux ---- - go.mod | 2 +- - go.sum | 4 +- - .../translate/v24tov31/v24tov31.go | 59 +++++++++++++++++-- - .../flatcar-linux/ign-converter/util/util.go | 4 -- - vendor/modules.txt | 2 +- - 5 files changed, 58 insertions(+), 13 deletions(-) - -diff --git a/go.mod b/go.mod -index d2104235..27dde696 100644 ---- a/go.mod -+++ b/go.mod -@@ -9,7 +9,7 @@ require ( - github.com/coreos/go-semver v0.3.0 - github.com/coreos/go-systemd/v22 v22.0.0 - github.com/coreos/vcontext v0.0.0-20211021162308-f1dbbca7bef4 -- github.com/flatcar-linux/ign-converter v0.1.1-0.20220311112608-f121a881f370 -+ github.com/flatcar-linux/ign-converter v0.2.0 - github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba - github.com/google/renameio v0.1.0 - github.com/google/uuid v1.1.1 -diff --git a/go.sum b/go.sum -index 043cc197..27755099 100644 ---- a/go.sum -+++ b/go.sum -@@ -68,8 +68,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF - github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= - github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= - github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= --github.com/flatcar-linux/ign-converter v0.1.1-0.20220311112608-f121a881f370 h1:Xz78ZBjeHkvxFpXSV2ppTDW2+ZudsCnT7VXVvqR1pto= --github.com/flatcar-linux/ign-converter v0.1.1-0.20220311112608-f121a881f370/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y= -+github.com/flatcar-linux/ign-converter v0.2.0 h1:XAIP2LHgqwtkPmJmilKSblCj0tGCO86qCrnbO6jgPM8= -+github.com/flatcar-linux/ign-converter v0.2.0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y= - github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba h1:HiTCL7737Hi944kXfLN8ReGoJtAiibGIsCk3MGlYy9M= - github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba/go.mod h1:JzHCIdCu9dy0xtezyBit/aOY4QIlJ12UYU6nXNPnnRE= - github.com/flatcar-linux/ignition/v2 v2.2.1-0.20220302150437-ce14e51676e9/go.mod h1:n076OVuGbg6f+j3YYoxFCjRyMU2hxsx6Q4Gy0xwO7cM= -diff --git a/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go b/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go -index 1e406ca2..d10cd7c3 100644 ---- a/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go -+++ b/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go -@@ -17,7 +17,9 @@ package v24tov31 - import ( - "errors" - "fmt" -+ "net/url" - "path" -+ "path/filepath" - "reflect" - - old "github.com/flatcar-linux/ignition/config/v2_4/types" -@@ -38,10 +40,6 @@ func Check2_4(cfg old.Config, fsMap map[string]string) error { - return fmt.Errorf("Invalid input config:\n%s", rpt.String()) - } - -- if len(cfg.Networkd.Units) != 0 { -- return util.UsesNetworkdError -- } -- - // check that all filesystems have a path - if fsMap == nil { - fsMap = map[string]string{} -@@ -139,6 +137,10 @@ func Translate(cfg old.Config, fsMap map[string]string) (types.Config, error) { - if err := Check2_4(cfg, fsMap); err != nil { - return types.Config{}, err - } -+ -+ files := translateFiles(cfg.Storage.Files, fsMap) -+ files = append(files, translateNetworkd(cfg.Networkd.Units, fsMap)...) -+ - res := types.Config{ - // Ignition section - Ignition: types.Ignition{ -@@ -174,7 +176,7 @@ func Translate(cfg old.Config, fsMap map[string]string) (types.Config, error) { - Disks: translateDisks(cfg.Storage.Disks), - Raid: translateRaid(cfg.Storage.Raid), - Filesystems: translateFilesystems(cfg.Storage.Filesystems, fsMap), -- Files: translateFiles(cfg.Storage.Files, fsMap), -+ Files: files, - Directories: translateDirectories(cfg.Storage.Directories, fsMap), - Links: translateLinks(cfg.Storage.Links, fsMap), - }, -@@ -512,6 +514,53 @@ func translateFiles(files []old.File, m map[string]string) (ret []types.File) { - return - } - -+func translateNetworkd(units []old.Networkdunit, m map[string]string) []types.File { -+ var ret []types.File -+ -+ for _, u := range units { -+ if u.Contents != "" { -+ file := types.File{ -+ Node: types.Node{ -+ // 2.x files are overwrite by default -+ Overwrite: util.BoolP(true), -+ }, -+ FileEmbedded1: types.FileEmbedded1{ -+ // Ignition default file permission -+ Mode: util.IntP(int(0644)), -+ }, -+ } -+ // path /etc/systemd/network is hardcoded in Ignition2.x codebase. -+ // TODO: customize this path at compilation time. -+ file.Node.Path = filepath.Join(m["root"], "/etc/systemd/network", u.Name) -+ -+ // URL encoding unit content to follow 'data' format - we could use base64 also. -+ file.FileEmbedded1.Contents.Source = util.StrPStrict("data:," + url.QueryEscape(u.Contents)) -+ -+ ret = append(ret, file) -+ } -+ -+ for _, d := range u.Dropins { -+ file := types.File{ -+ Node: types.Node{ -+ // 2.x files are overwrite by default -+ Overwrite: util.BoolP(true), -+ }, -+ FileEmbedded1: types.FileEmbedded1{ -+ // Ignition default file permission -+ Mode: util.IntP(int(0644)), -+ }, -+ } -+ -+ file.Node.Path = filepath.Join(m["root"], "/etc/systemd/network", string(u.Name)+".d", d.Name) -+ file.FileEmbedded1.Contents.Source = util.StrPStrict("data:," + url.QueryEscape(d.Contents)) -+ -+ ret = append(ret, file) -+ } -+ } -+ -+ return ret -+} -+ - func translateLinks(links []old.Link, m map[string]string) (ret []types.Link) { - for _, l := range links { - ret = append(ret, types.Link{ -diff --git a/vendor/github.com/flatcar-linux/ign-converter/util/util.go b/vendor/github.com/flatcar-linux/ign-converter/util/util.go -index 1968f472..347d148c 100644 ---- a/vendor/github.com/flatcar-linux/ign-converter/util/util.go -+++ b/vendor/github.com/flatcar-linux/ign-converter/util/util.go -@@ -15,7 +15,6 @@ - package util - - import ( -- "errors" - "fmt" - "strconv" - "strings" -@@ -24,9 +23,6 @@ import ( - - // Error definitions - --// UsesNetworkdError is the error for including networkd configs --var UsesNetworkdError = errors.New("config includes deprecated networkd section - use Files instead") -- - // NoFilesystemError type for when a filesystem is referenced in a config but there's no mapping to where - // it should be mounted (i.e. `path` in v3+ configs) - type NoFilesystemError string -diff --git a/vendor/modules.txt b/vendor/modules.txt -index bf99aa2d..0b6d436d 100644 ---- a/vendor/modules.txt -+++ b/vendor/modules.txt -@@ -81,7 +81,7 @@ github.com/coreos/vcontext/tree - github.com/coreos/vcontext/validate - # github.com/davecgh/go-spew v1.1.0 - github.com/davecgh/go-spew/spew --# github.com/flatcar-linux/ign-converter v0.1.1-0.20220311112608-f121a881f370 -+# github.com/flatcar-linux/ign-converter v0.2.0 - ## explicit - github.com/flatcar-linux/ign-converter/translate/v24tov31 - github.com/flatcar-linux/ign-converter/util --- -2.35.1 - diff --git a/sys-apps/ignition/ignition-2.13.0-r1.ebuild b/sys-apps/ignition/ignition-2.14.0-r1.ebuild similarity index 100% rename from sys-apps/ignition/ignition-2.13.0-r1.ebuild rename to sys-apps/ignition/ignition-2.14.0-r1.ebuild diff --git a/sys-apps/ignition/ignition-9999.ebuild b/sys-apps/ignition/ignition-9999.ebuild index e8f46b9d577..9538f5c267b 100644 --- a/sys-apps/ignition/ignition-9999.ebuild +++ b/sys-apps/ignition/ignition-9999.ebuild @@ -12,7 +12,7 @@ inherit coreos-go cros-workon systemd udev if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="d5545707b879e507749efed89881f987bd0ec81e" # main + CROS_WORKON_COMMIT="fef845a7d5ba463b4a93a5ed03a76721164c4a84" # v2.14.0 KEYWORDS="amd64 arm64" fi @@ -46,8 +46,8 @@ PATCHES=( "${FILESDIR}/0002-mod-add-ign-converter-dependency.patch" "${FILESDIR}/0003-sum-go-mod-tidy.patch" "${FILESDIR}/0004-vendor-go-mod-vendor.patch" - "${FILESDIR}/0005-config-v3_4-convert-ignition-2.x-to-3.1.patch" - "${FILESDIR}/0006-internal-prv-cmdline-backport-flatcar-patche.patch" + "${FILESDIR}/0005-config-v3_4-convert-ignition-2.x-to-3.4-exp.patch" + "${FILESDIR}/0006-internal-prv-cmdline-backport-flatcar-patch.patch" "${FILESDIR}/0007-provider-qemu-apply-fw_cfg-patch.patch" "${FILESDIR}/0008-config-3_4-test-add-ignition-2.x-test-cases.patch" "${FILESDIR}/0009-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch" @@ -57,8 +57,6 @@ PATCHES=( "${FILESDIR}/0013-Revert-drop-OEM-URI-support.patch" "${FILESDIR}/0014-internal-resource-url-support-btrfs-as-OEM-partition.patch" "${FILESDIR}/0015-internal-exec-stages-disks-prevent-races-with-udev.patch" - "${FILESDIR}/0016-update-ign-converter-to-fix-link-translation.patch" - "${FILESDIR}/0017-mod-update-ign-converter.patch" ) src_compile() { From 83118a544893f3c9fdec2516c46b7000f192cf5e Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 25 May 2022 11:16:15 +0200 Subject: [PATCH 2/2] changelog: add entry Signed-off-by: Mathieu Tortuyaux --- changelog/updates/2022-05-25-ignition.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/updates/2022-05-25-ignition.md diff --git a/changelog/updates/2022-05-25-ignition.md b/changelog/updates/2022-05-25-ignition.md new file mode 100644 index 00000000000..fefc10ed630 --- /dev/null +++ b/changelog/updates/2022-05-25-ignition.md @@ -0,0 +1 @@ +- ignition ([2.14.0](https://github.com/coreos/ignition/releases/tag/v2.14.0))