From 0c3c14e9c3e8bd48dc6603a944669a4a7c7babe1 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 20 Feb 2024 10:37:28 +0100 Subject: [PATCH 1/2] sys-apps/ignition: bump to 2.17.0 Signed-off-by: Mathieu Tortuyaux --- .../files/0001-sed-s-coreos-flatcar.patch | 1174 ++++++++++++----- ...002-config-add-ignition-translation.patch} | 6 +- ...0002-mod-add-flatcar-ignition-0.36.2.patch | 45 - ...0003-mod-add-flatcar-ignition-0.36.2.patch | 45 + .../ignition/files/0003-sum-go-mod-tidy.patch | 123 -- .../ignition/files/0004-sum-go-mod-tidy.patch | 407 ++++++ ....patch => 0005-vendor-go-mod-vendor.patch} | 34 +- ...fig-v3_5-convert-ignition-2.x-to-3.x.patch | 4 +- ...l-prv-cmdline-backport-flatcar-patch.patch | 16 +- ...008-provider-qemu-apply-fw_cfg-patch.patch | 48 +- ...3_5-test-add-ignition-2.x-test-cases.patch | 4 +- ...-ignore-fs-format-mismatches-for-the.patch | 6 +- ...info.-.config.data-and-.config.url-v.patch | 26 +- ...rsion-handle-configuration-version-1.patch | 4 +- ...cloud-init-detection-to-initial-pars.patch | 4 +- .../0014-Revert-drop-OEM-URI-support.patch | 265 +--- ...e-url-support-btrfs-as-OEM-partition.patch | 4 +- ...stages-disks-prevent-races-with-udev.patch | 197 --- ...016-translation-support-OEM-and-oem.patch} | 6 +- ...7-revert-internal-oem-drop-noop-OEMs.patch | 46 + ...ded-platforms-to-docs-to-pass-tests.patch} | 29 +- ...8-revert-internal-oem-drop-noop-OEMs.patch | 60 - .../files/0019-usr-share-oem-oem.patch | 42 + ...nternal-exec-stages-mount-Mount-oem.patch} | 8 +- .../files/0020-usr-share-oem-oem.patch | 56 - ...n-partprobe-after-partition-changes.patch} | 16 +- ....15.0-r4.ebuild => ignition-2.17.0.ebuild} | 0 .../sys-apps/ignition/ignition-9999.ebuild | 23 +- 28 files changed, 1549 insertions(+), 1149 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0005-config-add-ignition-translation.patch => 0002-config-add-ignition-translation.patch} (99%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-mod-add-flatcar-ignition-0.36.2.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-sum-go-mod-tidy.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0004-vendor-go-mod-vendor.patch => 0005-vendor-go-mod-vendor.patch} (99%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-internal-exec-stages-disks-prevent-races-with-udev.patch rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0017-translation-support-OEM-and-oem.patch => 0016-translation-support-OEM-and-oem.patch} (97%) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0019-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch => 0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch} (68%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-revert-internal-oem-drop-noop-OEMs.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-usr-share-oem-oem.patch rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0021-internal-exec-stages-mount-Mount-oem.patch => 0020-internal-exec-stages-mount-Mount-oem.patch} (88%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-usr-share-oem-oem.patch rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0022-sgdisk-Run-partprobe-after-partition-changes.patch => 0021-sgdisk-Run-partprobe-after-partition-changes.patch} (87%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/{ignition-2.15.0-r4.ebuild => ignition-2.17.0.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch index df1148ee8a..fff3c823df 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch @@ -1,15 +1,25 @@ -From 74ae0f953d21fea4368e6b007b0b4015aadd73c9 Mon Sep 17 00:00:00 2001 +From 854b82967946daf36c553c3ec45d13ca6738f812 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Fri, 24 Feb 2023 09:08:13 +0100 +Date: Mon, 19 Feb 2024 18:03:58 +0100 Subject: [PATCH 01/21] *: sed `s/coreos/flatcar/` Signed-off-by: Mathieu Tortuyaux --- + .github/ISSUE_TEMPLATE/release-checklist.md | 8 ++-- + .github/ISSUE_TEMPLATE/stabilize-checklist.md | 2 +- + .github/workflows/container-rebuild.yml | 2 +- + .github/workflows/container.yml | 2 +- + .github/workflows/ignition-validate.yml | 2 +- + README.md | 10 ++-- build | 4 +- + build_blackbox_tests | 10 ++-- + build_for_container | 2 +- config/config.go | 4 +- config/config_test.go | 14 +++--- + config/doc/generate.go | 2 +- + config/doc/schema.go | 2 +- 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 +- @@ -39,7 +49,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_0/types/storage_test.go | 4 +- config/v3_0/types/systemd.go | 6 +-- config/v3_0/types/systemd_test.go | 4 +- - config/v3_0/types/unit.go | 8 +-- + config/v3_0/types/unit.go | 8 ++-- config/v3_0/types/unit_test.go | 4 +- config/v3_0/types/url.go | 4 +- config/v3_0/types/url_test.go | 4 +- @@ -47,7 +57,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/config.go | 4 +- config/v3_1/types/config_test.go | 4 +- @@ -76,7 +86,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_1/types/storage_test.go | 4 +- config/v3_1/types/systemd.go | 6 +-- config/v3_1/types/systemd_test.go | 4 +- - config/v3_1/types/unit.go | 8 +-- + config/v3_1/types/unit.go | 8 ++-- config/v3_1/types/unit_test.go | 4 +- config/v3_1/types/url.go | 4 +- config/v3_1/types/url_test.go | 4 +- @@ -116,7 +126,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_2/types/systemd.go | 6 +-- config/v3_2/types/systemd_test.go | 4 +- config/v3_2/types/tang.go | 4 +- - config/v3_2/types/unit.go | 8 +-- + config/v3_2/types/unit.go | 8 ++-- config/v3_2/types/unit_test.go | 4 +- config/v3_2/types/url.go | 4 +- config/v3_2/types/url_test.go | 4 +- @@ -124,7 +134,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 +- @@ -158,7 +168,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_3/types/systemd.go | 6 +-- config/v3_3/types/systemd_test.go | 4 +- config/v3_3/types/tang.go | 4 +- - config/v3_3/types/unit.go | 8 +-- + config/v3_3/types/unit.go | 8 ++-- config/v3_3/types/unit_test.go | 4 +- config/v3_3/types/url.go | 4 +- config/v3_3/types/url_test.go | 4 +- @@ -166,7 +176,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_3/types/verification_test.go | 2 +- config/v3_4/config.go | 14 +++--- config/v3_4/config_test.go | 4 +- - config/v3_4/translate/translate.go | 8 +-- + config/v3_4/translate/translate.go | 8 ++-- config/v3_4/translate/translate_test.go | 4 +- config/v3_4/types/clevis.go | 4 +- config/v3_4/types/clevis_test.go | 4 +- @@ -201,7 +211,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_4/types/systemd_test.go | 4 +- config/v3_4/types/tang.go | 4 +- config/v3_4/types/tang_test.go | 4 +- - config/v3_4/types/unit.go | 8 +-- + config/v3_4/types/unit.go | 8 ++-- config/v3_4/types/unit_test.go | 4 +- config/v3_4/types/url.go | 4 +- config/v3_4/types/url_test.go | 4 +- @@ -244,7 +254,7 @@ Signed-off-by: Mathieu Tortuyaux .../v3_5_experimental/types/systemd_test.go | 4 +- config/v3_5_experimental/types/tang.go | 4 +- config/v3_5_experimental/types/tang_test.go | 4 +- - config/v3_5_experimental/types/unit.go | 8 +-- + config/v3_5_experimental/types/unit.go | 8 ++-- config/v3_5_experimental/types/unit_test.go | 4 +- config/v3_5_experimental/types/url.go | 4 +- config/v3_5_experimental/types/url_test.go | 4 +- @@ -252,18 +262,31 @@ Signed-off-by: Mathieu Tortuyaux .../types/verification_test.go | 2 +- config/validate/validate.go | 4 +- config/validate/validate_test.go | 2 +- + docs/_config.yml | 4 +- + docs/development.md | 12 ++--- + docs/distributor-notes.md | 6 +-- + docs/getting-started.md | 6 +-- + docs/index.md | 6 +-- + docs/migrating-configs.md | 2 +- + docs/specs.md | 2 +- + dracut/30ignition/ignition-complete.target | 2 +- + .../ignition-diskful-subsequent.target | 2 +- + dracut/30ignition/ignition-diskful.target | 2 +- + dracut/30ignition/ignition-subsequent.target | 2 +- + dracut/30ignition/module-setup.sh | 2 +- go.mod | 2 +- - internal/apply/apply.go | 30 +++++------ + internal/apply/apply.go | 30 ++++++------ internal/distro/distro.go | 2 +- + internal/doc/main.go | 14 +++--- 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 | 22 ++++----- + internal/exec/stages/disks/disks.go | 16 +++---- + internal/exec/stages/disks/filesystems.go | 8 ++-- internal/exec/stages/disks/luks.go | 12 ++--- - internal/exec/stages/disks/partitions.go | 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 +- @@ -272,49 +295,55 @@ 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 | 4 +- internal/exec/util/user_group_lookup_test.go | 2 +- internal/exec/util/util.go | 6 +-- - 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 | 12 ++--- - internal/providers/azurestack/azurestack.go | 6 +-- - internal/providers/cloudstack/cloudstack.go | 14 +++--- + internal/main.go | 18 +++---- + internal/platform/platform.go | 10 ++-- + internal/providers/aliyun/aliyun.go | 8 ++-- + internal/providers/applehv/applehv.go | 10 ++-- + internal/providers/aws/aws.go | 12 ++--- + internal/providers/azure/azure.go | 14 +++--- + internal/providers/azurestack/azurestack.go | 8 ++-- + internal/providers/cloudstack/cloudstack.go | 16 +++---- internal/providers/cmdline/cmdline.go | 12 ++--- - .../providers/digitalocean/digitalocean.go | 6 +-- - internal/providers/exoscale/exoscale.go | 6 +-- - 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_fwcfg.go | 6 +-- + .../providers/digitalocean/digitalocean.go | 8 ++-- + internal/providers/exoscale/exoscale.go | 8 ++-- + internal/providers/file/file.go | 8 ++-- + internal/providers/gcp/gcp.go | 8 ++-- + internal/providers/hetzner/hetzner.go | 8 ++-- + internal/providers/hyperv/kvp.go | 12 ++--- + internal/providers/ibmcloud/ibmcloud.go | 14 +++--- + internal/providers/kubevirt/kubevirt.go | 14 +++--- + internal/providers/metal/metal.go | 8 ++-- + internal/providers/nutanix/nutanix.go | 14 +++--- + internal/providers/openstack/openstack.go | 16 +++---- + internal/providers/packet/packet.go | 8 ++-- + internal/providers/powervs/powervs.go | 14 +++--- + internal/providers/qemu/qemu_blockdev.go | 12 ++--- + internal/providers/qemu/qemu_fwcfg.go | 10 ++-- internal/providers/system/system.go | 14 +++--- internal/providers/util/config.go | 6 +-- - 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/providers/util/file.go | 4 +- + internal/providers/virtualbox/virtualbox.go | 10 ++-- + internal/providers/vmware/vmware_amd64.go | 8 ++-- + .../providers/vmware/vmware_unsupported.go | 6 +-- + internal/providers/vultr/vultr.go | 8 ++-- + internal/providers/zvm/zvm.go | 14 +++--- + internal/register/providers.go | 48 +++++++++---------- + internal/register/stages.go | 14 +++--- 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/state/state.go | 2 +- internal/util/tools/docs/docs.go | 2 +- internal/util/verification.go | 2 +- internal/util/verification_test.go | 2 +- @@ -354,21 +383,133 @@ Signed-off-by: Mathieu Tortuyaux tests/positive/partitions/mixed.go | 4 +- tests/positive/partitions/no-op.go | 4 +- tests/positive/partitions/verification.go | 4 +- + tests/positive/partitions/wipe.go | 4 +- tests/positive/partitions/zeros.go | 4 +- 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 | 14 +++--- - tests/registry/registry.go | 36 ++++++------- + tests/registry/registry.go | 36 +++++++------- tests/servers/servers.go | 2 +- tests/validator.go | 4 +- validate/main.go | 4 +- - 362 files changed, 954 insertions(+), 954 deletions(-) + 392 files changed, 1051 insertions(+), 1051 deletions(-) +diff --git a/.github/ISSUE_TEMPLATE/release-checklist.md b/.github/ISSUE_TEMPLATE/release-checklist.md +index 9803e88a..75224dbb 100644 +--- a/.github/ISSUE_TEMPLATE/release-checklist.md ++++ b/.github/ISSUE_TEMPLATE/release-checklist.md +@@ -6,9 +6,9 @@ Release checklist: + + Tagging: + - [ ] Write release notes in `docs/release-notes.md`. Get them reviewed and merged +- - [ ] If the release signing key has changed because a new Fedora release has gone stable, note the change as done [here](https://github.com/coreos/ignition/releases/tag/v2.10.1). ++ - [ ] If the release signing key has changed because a new Fedora release has gone stable, note the change as done [here](https://github.com/flatcar/ignition/releases/tag/v2.10.1). + - [ ] If doing a branched release, also include a PR to merge the `docs/release-notes.md` changes into main +- - [ ] Ensure your local copy is up to date with the upstream main branch (`git@github.com:coreos/ignition.git`) ++ - [ ] Ensure your local copy is up to date with the upstream main branch (`git@github.com:flatcar/ignition.git`) + - [ ] Ensure your working directory is clean (`git clean -fdx`) + - [ ] Ensure you can sign commits and any yubikeys/smartcards are plugged in + - [ ] Run `./tag_release.sh ` +@@ -51,13 +51,13 @@ GitHub release: + - [ ] Wait for the ticket to be closed + - [ ] Download the artifacts and signatures + - [ ] Verify the signatures +- - [ ] Find the new tag in the [GitHub tag list](https://github.com/coreos/ignition/tags) and click the triple dots menu, and create a draft release for it. ++ - [ ] Find the new tag in the [GitHub tag list](https://github.com/flatcar/ignition/tags) and click the triple dots menu, and create a draft release for it. + - [ ] Copy and paste the release notes from `docs/release-notes.md` + - [ ] Upload all the release artifacts and their signatures + - [ ] Publish the release + + Quay release: +- - [ ] Visit the [Quay tags page](https://quay.io/repository/coreos/ignition-validate?tab=tags) and wait for a versioned tag to appear ++ - [ ] Visit the [Quay tags page](https://quay.io/repository/flatcar/ignition-validate?tab=tags) and wait for a versioned tag to appear + - [ ] Click the gear next to the tag, select "Add New Tag", enter `release`, and confirm + + RHCOS packaging for the current RHCOS development release: +diff --git a/.github/ISSUE_TEMPLATE/stabilize-checklist.md b/.github/ISSUE_TEMPLATE/stabilize-checklist.md +index 795dc509..bf4ab32c 100644 +--- a/.github/ISSUE_TEMPLATE/stabilize-checklist.md ++++ b/.github/ISSUE_TEMPLATE/stabilize-checklist.md +@@ -64,7 +64,7 @@ If there are any external kola tests that are not part of the Ignition repo (e.g + + ## Other packages + +-- [ ] Add a stable spec to [ignition-config-rs](https://github.com/coreos/ignition-config-rs) and [regenerate schema](https://github.com/coreos/ignition-config-rs/blob/main/docs/development.md#regenerating-schemars). ++- [ ] Add a stable spec to [ignition-config-rs](https://github.com/flatcar/ignition-config-rs) and [regenerate schema](https://github.com/coreos/ignition-config-rs/blob/main/docs/development.md#regenerating-schemars). + - [ ] Put out a new release. + - [ ] Bump ignition-config-rs in coreos-installer to support the new spec in `iso customize` and `pxe customize`. Update release notes. + - [ ] Put out a new coreos-installer release. +diff --git a/.github/workflows/container-rebuild.yml b/.github/workflows/container-rebuild.yml +index 85df49d0..06618f17 100644 +--- a/.github/workflows/container-rebuild.yml ++++ b/.github/workflows/container-rebuild.yml +@@ -42,6 +42,6 @@ jobs: + with: + credentials: ${{ secrets.QUAY_AUTH }} + file: Dockerfile.validate +- push: quay.io/coreos/ignition-validate ++ push: quay.io/flatcar/ignition-validate + arches: amd64 arm64 + tags: ${{ github.event.inputs.docker-tag }} release +diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml +index 4840ff3e..2048673f 100644 +--- a/.github/workflows/container.yml ++++ b/.github/workflows/container.yml +@@ -38,7 +38,7 @@ jobs: + with: + credentials: ${{ secrets.QUAY_AUTH }} + file: Dockerfile.validate +- push: quay.io/coreos/ignition-validate ++ push: quay.io/flatcar/ignition-validate + arches: amd64 arm64 + # Speed up PR CI by skipping non-amd64 + pr-arches: amd64 +diff --git a/.github/workflows/ignition-validate.yml b/.github/workflows/ignition-validate.yml +index 488bc1c4..544cb218 100644 +--- a/.github/workflows/ignition-validate.yml ++++ b/.github/workflows/ignition-validate.yml +@@ -32,7 +32,7 @@ jobs: + uses: actions/checkout@v3 + - 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/ignition/v2/validate + - name: Test ignition-validate + shell: bash + run: | +diff --git a/README.md b/README.md +index b3c26460..69c14cbc 100644 +--- a/README.md ++++ b/README.md +@@ -16,18 +16,18 @@ Odds are good that you don't want to invoke Ignition directly. In fact, it isn't + + See [CONTRIBUTING](CONTRIBUTING.md) for details on submitting patches and the contribution workflow. + +-To help triage or fix bugs, see the current [Ignition issues](https://github.com/coreos/ignition/issues/). ++To help triage or fix bugs, see the current [Ignition issues](https://github.com/flatcar/ignition/issues/). + + ## Config Validation + +-To validate a config for Ignition there are binaries for a cli tool called `ignition-validate` available [on the releases page][releases]. There is also an ignition-validate container: `quay.io/coreos/ignition-validate`. ++To validate a config for Ignition there are binaries for a cli tool called `ignition-validate` available [on the releases page][releases]. There is also an ignition-validate container: `quay.io/flatcar/ignition-validate`. + + Example: + ``` + # This example uses podman, but docker can be used too +-podman run --pull=always --rm -i quay.io/coreos/ignition-validate:release - < myconfig.ign ++podman run --pull=always --rm -i quay.io/flatcar/ignition-validate:release - < myconfig.ign + ``` + + [getting started]: docs/getting-started.md +-[issues]: https://github.com/coreos/ignition/issues/new/choose +-[releases]: https://github.com/coreos/ignition/releases ++[issues]: https://github.com/flatcar/ignition/issues/new/choose ++[releases]: https://github.com/flatcar/ignition/releases diff --git a/build b/build index dba50388..b8f0a049 100755 --- a/build @@ -391,6 +532,40 @@ index dba50388..b8f0a049 100755 eval $(go env) +diff --git a/build_blackbox_tests b/build_blackbox_tests +index 9b3dd5b7..6527a3fb 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/ignition/v2/internal/distro.useraddCmd=useradd-stub " ++GLDFLAGS+="-X github.com/flatcar/ignition/v2/internal/distro.usermodCmd=usermod-stub " ++GLDFLAGS+="-X github.com/flatcar/ignition/v2/internal/distro.userdelCmd=userdel-stub " ++GLDFLAGS+="-X github.com/flatcar/ignition/v2/internal/distro.groupdelCmd=groupdel-stub " ++GLDFLAGS+="-X github.com/flatcar/ignition/v2/internal/distro.blackboxTesting=true " + + . ./build + +diff --git a/build_for_container b/build_for_container +index 7ddfc55d..147a5ef0 100755 +--- a/build_for_container ++++ b/build_for_container +@@ -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/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 e4a2172d..d3e04176 100644 --- a/config/config.go @@ -431,6 +606,32 @@ index 1e35aee9..d396112d 100644 ) type typeSet map[reflect.Type]struct{} +diff --git a/config/doc/generate.go b/config/doc/generate.go +index 9dd3e4b7..ea2f36f3 100644 +--- a/config/doc/generate.go ++++ b/config/doc/generate.go +@@ -20,7 +20,7 @@ import ( + "reflect" + "strings" + +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/util" + ) + + type generator struct { +diff --git a/config/doc/schema.go b/config/doc/schema.go +index 222ad601..374ddb4b 100644 +--- a/config/doc/schema.go ++++ b/config/doc/schema.go +@@ -23,7 +23,7 @@ import ( + "regexp" + "strings" + +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/go-semver/semver" + "github.com/mitchellh/copystructure" diff --git a/config/merge/merge.go b/config/merge/merge.go index 1ba91b3d..f2bcc274 100644 --- a/config/merge/merge.go @@ -901,22 +1102,20 @@ index ac521ba7..818959f4 100644 vpath "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_0/types/systemd_test.go b/config/v3_0/types/systemd_test.go -index 798eb10f..d4a4be01 100644 +index 798eb10f..b432e83b 100644 --- a/config/v3_0/types/systemd_test.go +++ b/config/v3_0/types/systemd_test.go -@@ -18,10 +18,10 @@ import ( +@@ -18,8 +18,8 @@ import ( "fmt" "testing" - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" + "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/util" + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" "github.com/stretchr/testify/assert" - ) - diff --git a/config/v3_0/types/unit.go b/config/v3_0/types/unit.go index 786debae..3505d5f4 100644 --- a/config/v3_0/types/unit.go @@ -1187,20 +1386,18 @@ index 94f6b0a2..67bc42f6 100644 func TestFilesystemValidateFormat(t *testing.T) { diff --git a/config/v3_1/types/headers.go b/config/v3_1/types/headers.go -index be1aadad..4ad13bf9 100644 +index be1aadad..e968a2b4 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/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -+ "github.com/flatcar/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 40380b68..5e888830 100644 --- a/config/v3_1/types/headers_test.go @@ -1462,22 +1659,20 @@ index ac521ba7..818959f4 100644 vpath "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_1/types/systemd_test.go b/config/v3_1/types/systemd_test.go -index 798eb10f..d4a4be01 100644 +index 798eb10f..b432e83b 100644 --- a/config/v3_1/types/systemd_test.go +++ b/config/v3_1/types/systemd_test.go -@@ -18,10 +18,10 @@ import ( +@@ -18,8 +18,8 @@ import ( "fmt" "testing" - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" + "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/util" + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" "github.com/stretchr/testify/assert" - ) - diff --git a/config/v3_1/types/unit.go b/config/v3_1/types/unit.go index 786debae..3505d5f4 100644 --- a/config/v3_1/types/unit.go @@ -1759,20 +1954,18 @@ index 1f8db903..6e710426 100644 func TestFilesystemValidateFormat(t *testing.T) { diff --git a/config/v3_2/types/headers.go b/config/v3_2/types/headers.go -index be1aadad..4ad13bf9 100644 +index be1aadad..e968a2b4 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/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -+ "github.com/flatcar/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 40380b68..5e888830 100644 --- a/config/v3_2/types/headers_test.go @@ -2049,22 +2242,20 @@ index ac521ba7..818959f4 100644 vpath "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_2/types/systemd_test.go b/config/v3_2/types/systemd_test.go -index 798eb10f..d4a4be01 100644 +index 798eb10f..b432e83b 100644 --- a/config/v3_2/types/systemd_test.go +++ b/config/v3_2/types/systemd_test.go -@@ -18,10 +18,10 @@ import ( +@@ -18,8 +18,8 @@ import ( "fmt" "testing" - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" + "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/util" + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" "github.com/stretchr/testify/assert" - ) - diff --git a/config/v3_2/types/tang.go b/config/v3_2/types/tang.go index 86ab79c9..a2fd8ee6 100644 --- a/config/v3_2/types/tang.go @@ -2380,20 +2571,18 @@ index 1f8db903..6e710426 100644 func TestFilesystemValidateFormat(t *testing.T) { diff --git a/config/v3_3/types/headers.go b/config/v3_3/types/headers.go -index be1aadad..4ad13bf9 100644 +index be1aadad..e968a2b4 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/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -+ "github.com/flatcar/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 40380b68..5e888830 100644 --- a/config/v3_3/types/headers_test.go @@ -2685,22 +2874,20 @@ index ac521ba7..818959f4 100644 vpath "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_3/types/systemd_test.go b/config/v3_3/types/systemd_test.go -index 798eb10f..d4a4be01 100644 +index 798eb10f..b432e83b 100644 --- a/config/v3_3/types/systemd_test.go +++ b/config/v3_3/types/systemd_test.go -@@ -18,10 +18,10 @@ import ( +@@ -18,8 +18,8 @@ import ( "fmt" "testing" - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" + "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/util" + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" "github.com/stretchr/testify/assert" - ) - diff --git a/config/v3_3/types/tang.go b/config/v3_3/types/tang.go index 86ab79c9..a2fd8ee6 100644 --- a/config/v3_3/types/tang.go @@ -3016,20 +3203,18 @@ index 1f8db903..6e710426 100644 func TestFilesystemValidateFormat(t *testing.T) { diff --git a/config/v3_4/types/headers.go b/config/v3_4/types/headers.go -index be1aadad..4ad13bf9 100644 +index be1aadad..e968a2b4 100644 --- a/config/v3_4/types/headers.go +++ b/config/v3_4/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/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -+ "github.com/flatcar/ignition/v2/config/shared/errors" ) - - // Parse generates standard net/http headers from the data in HTTPHeaders diff --git a/config/v3_4/types/headers_test.go b/config/v3_4/types/headers_test.go index 40380b68..5e888830 100644 --- a/config/v3_4/types/headers_test.go @@ -3321,22 +3506,20 @@ index ac521ba7..818959f4 100644 vpath "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_4/types/systemd_test.go b/config/v3_4/types/systemd_test.go -index 798eb10f..d4a4be01 100644 +index 798eb10f..b432e83b 100644 --- a/config/v3_4/types/systemd_test.go +++ b/config/v3_4/types/systemd_test.go -@@ -18,10 +18,10 @@ import ( +@@ -18,8 +18,8 @@ import ( "fmt" "testing" - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" + "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/util" + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" "github.com/stretchr/testify/assert" - ) - diff --git a/config/v3_4/types/tang.go b/config/v3_4/types/tang.go index 1839d6cc..26c155e5 100644 --- a/config/v3_4/types/tang.go @@ -3353,22 +3536,20 @@ index 1839d6cc..26c155e5 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_4/types/tang_test.go b/config/v3_4/types/tang_test.go -index fb57b1e4..6f31fd99 100644 +index fb57b1e4..ed65a712 100644 --- a/config/v3_4/types/tang_test.go +++ b/config/v3_4/types/tang_test.go -@@ -18,10 +18,10 @@ import ( +@@ -18,8 +18,8 @@ import ( "reflect" "testing" - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" + "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/util" + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" ) - - func TestTangValidation(t *testing.T) { diff --git a/config/v3_4/types/unit.go b/config/v3_4/types/unit.go index c5ee1e8e..5a9c3b22 100644 --- a/config/v3_4/types/unit.go @@ -3667,20 +3848,18 @@ index 1f8db903..6e710426 100644 func TestFilesystemValidateFormat(t *testing.T) { diff --git a/config/v3_5_experimental/types/headers.go b/config/v3_5_experimental/types/headers.go -index be1aadad..4ad13bf9 100644 +index be1aadad..e968a2b4 100644 --- a/config/v3_5_experimental/types/headers.go +++ b/config/v3_5_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/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -+ "github.com/flatcar/ignition/v2/config/shared/errors" ) - - // Parse generates standard net/http headers from the data in HTTPHeaders diff --git a/config/v3_5_experimental/types/headers_test.go b/config/v3_5_experimental/types/headers_test.go index 40380b68..5e888830 100644 --- a/config/v3_5_experimental/types/headers_test.go @@ -3972,22 +4151,20 @@ index ac521ba7..818959f4 100644 vpath "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_5_experimental/types/systemd_test.go b/config/v3_5_experimental/types/systemd_test.go -index 798eb10f..d4a4be01 100644 +index 798eb10f..b432e83b 100644 --- a/config/v3_5_experimental/types/systemd_test.go +++ b/config/v3_5_experimental/types/systemd_test.go -@@ -18,10 +18,10 @@ import ( +@@ -18,8 +18,8 @@ import ( "fmt" "testing" - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" + "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/util" + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" "github.com/stretchr/testify/assert" - ) - diff --git a/config/v3_5_experimental/types/tang.go b/config/v3_5_experimental/types/tang.go index 1839d6cc..26c155e5 100644 --- a/config/v3_5_experimental/types/tang.go @@ -4004,22 +4181,20 @@ index 1839d6cc..26c155e5 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/config/v3_5_experimental/types/tang_test.go b/config/v3_5_experimental/types/tang_test.go -index fb57b1e4..6f31fd99 100644 +index fb57b1e4..ed65a712 100644 --- a/config/v3_5_experimental/types/tang_test.go +++ b/config/v3_5_experimental/types/tang_test.go -@@ -18,10 +18,10 @@ import ( +@@ -18,8 +18,8 @@ import ( "reflect" "testing" - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" + "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/util" + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" ) - - func TestTangValidation(t *testing.T) { diff --git a/config/v3_5_experimental/types/unit.go b/config/v3_5_experimental/types/unit.go index c5ee1e8e..5a9c3b22 100644 --- a/config/v3_5_experimental/types/unit.go @@ -4138,15 +4313,240 @@ index 18eea933..4f77f19c 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" +diff --git a/docs/_config.yml b/docs/_config.yml +index 9c8859ff..0817bf9e 100644 +--- a/docs/_config.yml ++++ b/docs/_config.yml +@@ -23,7 +23,7 @@ color_scheme: coreos + # Aux links for the upper right navigation + aux_links: + "Ignition on GitHub": +- - "https://github.com/coreos/ignition" ++ - "https://github.com/flatcar/ignition" + + footer_content: "Copyright © Red Hat, Inc. and others." + +@@ -34,7 +34,7 @@ last_edit_time_format: "%b %e %Y at %I:%M %p" + # Footer "Edit this page on GitHub" link text + gh_edit_link: true + gh_edit_link_text: "Edit this page on GitHub" +-gh_edit_repository: "https://github.com/coreos/ignition" ++gh_edit_repository: "https://github.com/flatcar/ignition" + gh_edit_branch: "main" + gh_edit_source: docs + gh_edit_view_mode: "tree" +diff --git a/docs/development.md b/docs/development.md +index 265ec5b2..4ebc74b9 100644 +--- a/docs/development.md ++++ b/docs/development.md +@@ -24,7 +24,7 @@ See also the [Ignition rationale](rationale.md). + + ### Code structure + +-The [frontend](https://github.com/coreos/ignition/tree/main/config) handles config parsing and validation which need not run on the target system. The [backend](https://github.com/coreos/ignition/tree/main/internal) performs the configuration of the target system. The frontend is a stable library API that is used by other programs, so existing frontend API cannot be changed without bumping the Ignition major version. ++The [frontend](https://github.com/flatcar/ignition/tree/main/config) handles config parsing and validation which need not run on the target system. The [backend](https://github.com/coreos/ignition/tree/main/internal) performs the configuration of the target system. The frontend is a stable library API that is used by other programs, so existing frontend API cannot be changed without bumping the Ignition major version. + + ### Adding functionality + +@@ -36,7 +36,7 @@ New functionality added to a config spec must be declarative: it must describe w + + When reprovisioning an existing node, the config may want to reuse existing disks and filesystems without reformatting them. Config directives should support detecting and reusing an existing object (RAID volume, filesystem, etc.) if its properties match those specified in the config. + +-Ignition specs should not include distro-specific functionality such as package management. Features may require support from the distro (for example, setting kernel arguments), but such features should be broadly applicable. Distro-specific options such as support for SELinux, or paths to external binaries, can be configured at build time in the [`distro`](https://github.com/coreos/ignition/blob/main/internal/distro/distro.go) package. Distro-specific glue (e.g. support for reformatting the root filesystem) should be implemented outside the Ignition codebase, in Dracut modules that run between Ignition stages (see below). ++Ignition specs should not include distro-specific functionality such as package management. Features may require support from the distro (for example, setting kernel arguments), but such features should be broadly applicable. Distro-specific options such as support for SELinux, or paths to external binaries, can be configured at build time in the [`distro`](https://github.com/flatcar/ignition/blob/main/internal/distro/distro.go) package. Distro-specific glue (e.g. support for reformatting the root filesystem) should be implemented outside the Ignition codebase, in Dracut modules that run between Ignition stages (see below). + + Ideally, functionality should not be added to an experimental spec in the same Ignition release that the spec is stabilized. Doing so prevents users from trying out the functionality before we commit to maintaining it. + +@@ -178,15 +178,15 @@ To add a blackbox test create a function which yields a `Test` object. A `Test` + + The test should be added to the init function inside of the test file. If the test module is being created then an `init` function should be created which registers the tests and the package must be imported inside of `tests/registry/registry.go` to allow for discovery. + +-UUIDs may be required in the following fields of a `Test` object: `In`, `Out`, and `Config`. Replace all GUIDs with GUID varaibles which take on the format `$uuid` (e.g. $uuid123). Where `` must be a positive integer. GUID variables with identical `` fields will be replaced with identical GUIDs. For example, look at [tests/positive/partitions/zeros.go](https://github.com/coreos/ignition/blob/main/tests/positive/partitions/zeros.go). ++UUIDs may be required in the following fields of a `Test` object: `In`, `Out`, and `Config`. Replace all GUIDs with GUID varaibles which take on the format `$uuid` (e.g. $uuid123). Where `` must be a positive integer. GUID variables with identical `` fields will be replaced with identical GUIDs. For example, look at [tests/positive/partitions/zeros.go](https://github.com/flatcar/ignition/blob/main/tests/positive/partitions/zeros.go). + + ## Releasing Ignition + +-Create a new [release checklist](https://github.com/coreos/ignition/issues/new?labels=kind/release&template=release-checklist.md) and follow the steps there. ++Create a new [release checklist](https://github.com/flatcar/ignition/issues/new?labels=kind/release&template=release-checklist.md) and follow the steps there. + + ## The build process + +-Note that the `build` script included in this repository is a convenience script only and not used for the actual release binaries. Those are built using an `ignition.spec` maintained in [Fedora rpms/ignition](https://src.fedoraproject.org/rpms/ignition). (The `ignition-validate` [container](https://quay.io/repository/coreos/ignition-validate) is built by the `build_for_container` script, which is not further described here.) ++Note that the `build` script included in this repository is a convenience script only and not used for the actual release binaries. Those are built using an `ignition.spec` maintained in [Fedora rpms/ignition](https://src.fedoraproject.org/rpms/ignition). (The `ignition-validate` [container](https://quay.io/repository/flatcar/ignition-validate) is built by the `build_for_container` script, which is not further described here.) + This build process uses the [go-rpm-macros](https://pagure.io/go-rpm-macros) to set up the Go build environment and is subject to the [Golang Packaging Guidelines](https://docs.fedoraproject.org/en-US/packaging-guidelines/Golang/). + + Consult the [Package Maintenance Guide](https://docs.fedoraproject.org/en-US/package-maintainers/Package_Maintenance_Guide/) and the [Pull Requests Guide](https://docs.fedoraproject.org/en-US/ci/pull-requests/) if you want to contribute to the build process. +@@ -195,4 +195,4 @@ In case you have trouble with the aforementioned standard Pull Request Guide, co + + ## Marking an experimental spec as stable + +-Create a new [stabilization checklist](https://github.com/coreos/ignition/issues/new?template=stabilize-checklist.md) and follow the steps there. ++Create a new [stabilization checklist](https://github.com/flatcar/ignition/issues/new?template=stabilize-checklist.md) and follow the steps there. +diff --git a/docs/distributor-notes.md b/docs/distributor-notes.md +index b85b8f66..80917107 100644 +--- a/docs/distributor-notes.md ++++ b/docs/distributor-notes.md +@@ -10,8 +10,8 @@ nav_order: 10 + + ## Kernel Arguments + +-When Ignition is updating kernel arguments it will call out to a binary (defined in `internal/distro/distro.go` and overridable at build-time via overriding the `github.com/coreos/ignition/v2/internal/distro.kargsCmd` build flag). Ignition expects that the binary accepts `--should-exist` & `--should-not-exist` parameters. Should exist operations should append the argument if missing and should not exist should NOT fail if the argument is not present. The binary should also reboot the system if necessary. ++When Ignition is updating kernel arguments it will call out to a binary (defined in `internal/distro/distro.go` and overridable at build-time via overriding the `github.com/flatcar/ignition/v2/internal/distro.kargsCmd` build flag). Ignition expects that the binary accepts `--should-exist` & `--should-not-exist` parameters. Should exist operations should append the argument if missing and should not exist should NOT fail if the argument is not present. The binary should also reboot the system if necessary. + +-As an example of the binary implementation look at [`examples/ignition-kargs-helper`](https://github.com/coreos/ignition/blob/main/examples/ignition-kargs-helper). ++As an example of the binary implementation look at [`examples/ignition-kargs-helper`](https://github.com/flatcar/ignition/blob/main/examples/ignition-kargs-helper). + +-If your implementation of Ignition doesn't intend to ship kargs functionality the [`ignition-kargs.service` unit](https://github.com/coreos/ignition/blob/main/dracut/30ignition/ignition-kargs.service) should be disabled. ++If your implementation of Ignition doesn't intend to ship kargs functionality the [`ignition-kargs.service` unit](https://github.com/flatcar/ignition/blob/main/dracut/30ignition/ignition-kargs.service) should be disabled. +diff --git a/docs/getting-started.md b/docs/getting-started.md +index 9598332b..b4cd3225 100644 +--- a/docs/getting-started.md ++++ b/docs/getting-started.md +@@ -24,12 +24,12 @@ The Linux distro may provide a base config which specifies default configuration + + ## Config Validation + +-To validate a config for Ignition there are binaries for a cli tool called `ignition-validate` available [on the releases page][releases]. There is also an ignition-validate container: `quay.io/coreos/ignition-validate`. ++To validate a config for Ignition there are binaries for a cli tool called `ignition-validate` available [on the releases page][releases]. There is also an ignition-validate container: `quay.io/flatcar/ignition-validate`. + + Example: + ``` + # This example uses podman, but docker can be used too +-podman run --pull=always --rm -i quay.io/coreos/ignition-validate:release - < myconfig.ign ++podman run --pull=always --rm -i quay.io/flatcar/ignition-validate:release - < myconfig.ign + ``` + + ## Troubleshooting +@@ -68,7 +68,7 @@ Ignition is not typically run more than once during a machine's lifetime in a gi + [firstboot]: rationale.md#ignition-runs-only-on-the-first-boot + [mime]: http://www.iana.org/assignments/media-types/application/vnd.coreos.ignition+json + [operator-notes]: operator-notes.md +-[releases]: https://github.com/coreos/ignition/releases ++[releases]: https://github.com/flatcar/ignition/releases + [platforms]: supported-platforms.md + [preset]: https://www.freedesktop.org/software/systemd/man/systemd.preset.html + [troubleshooting]: #troubleshooting +diff --git a/docs/index.md b/docs/index.md +index 0e37a161..3236004a 100644 +--- a/docs/index.md ++++ b/docs/index.md +@@ -14,13 +14,13 @@ Odds are good that you don't want to invoke Ignition directly. In fact, it isn't + + - Mailing list: [coreos@lists.fedoraproject.org](https://lists.fedoraproject.org/archives/list/coreos@lists.fedoraproject.org/) + - IRC: #[fedora-coreos](ircs://irc.libera.chat:6697/#fedora-coreos) on Libera.Chat +-- Reporting bugs: [issues](https://github.com/coreos/ignition/issues/new/choose) ++- Reporting bugs: [issues](https://github.com/flatcar/ignition/issues/new/choose) + + ## Contributing + + See [CONTRIBUTING][contributing] for details on submitting patches and the contribution workflow. + +-To help triage or fix bugs, see the current [Ignition issues](https://github.com/coreos/ignition/issues/). ++To help triage or fix bugs, see the current [Ignition issues](https://github.com/flatcar/ignition/issues/). + + [getting started]: getting-started.md +-[contributing]: https://github.com/coreos/ignition/blob/main/CONTRIBUTING.md ++[contributing]: https://github.com/flatcar/ignition/blob/main/CONTRIBUTING.md +diff --git a/docs/migrating-configs.md b/docs/migrating-configs.md +index 2a220197..5381abc7 100644 +--- a/docs/migrating-configs.md ++++ b/docs/migrating-configs.md +@@ -584,7 +584,7 @@ The networkd section has been removed. Use the files section instead. Refer to t + + ## From 2.x.0 to 2.3.0 + +-Refer to [this doc in the `spec2x`](https://github.com/coreos/ignition/tree/spec2x/doc/migrating-configs.md) branch of this repository. That doc also describes specification version 2.4.0, a parallel development which shares some enhancements with spec 3.1.0. ++Refer to [this doc in the `spec2x`](https://github.com/flatcar/ignition/tree/spec2x/doc/migrating-configs.md) branch of this repository. That doc also describes specification version 2.4.0, a parallel development which shares some enhancements with spec 3.1.0. + + [networkd-docs]: https://www.freedesktop.org/software/systemd/man/systemd-networkd.html# + [operator-notes]: operator-notes.md +diff --git a/docs/specs.md b/docs/specs.md +index 43b1a799..a2311b1a 100644 +--- a/docs/specs.md ++++ b/docs/specs.md +@@ -37,7 +37,7 @@ Ignition: + ## Legacy spec 2.x configuration specifications + + Documentation for the spec 1 and 2.x configuration specifications is available +-in the legacy [`spec2x` branch](https://github.com/coreos/ignition/tree/spec2x/doc) ++in the legacy [`spec2x` branch](https://github.com/flatcar/ignition/tree/spec2x/doc) + of Ignition. Those specification versions are used by older versions of RHEL + CoreOS and Flatcar Container Linux. This branch is no longer maintained. + +diff --git a/dracut/30ignition/ignition-complete.target b/dracut/30ignition/ignition-complete.target +index 6241b1d2..43a80147 100644 +--- a/dracut/30ignition/ignition-complete.target ++++ b/dracut/30ignition/ignition-complete.target +@@ -5,7 +5,7 @@ + # initrd. + [Unit] + Description=Ignition Complete +-Documentation=https://github.com/coreos/ignition ++Documentation=https://github.com/flatcar/ignition + ConditionPathExists=/etc/initrd-release + Before=initrd.target + +diff --git a/dracut/30ignition/ignition-diskful-subsequent.target b/dracut/30ignition/ignition-diskful-subsequent.target +index 0adda1f5..e3b0b5f2 100644 +--- a/dracut/30ignition/ignition-diskful-subsequent.target ++++ b/dracut/30ignition/ignition-diskful-subsequent.target +@@ -3,7 +3,7 @@ + # boot disk and *aren't* doing the first boot. + [Unit] + Description=Ignition Subsequent Boot Disk Setup +-Documentation=https://github.com/coreos/ignition ++Documentation=https://github.com/flatcar/ignition + ConditionPathExists=/etc/initrd-release + Before=ignition-subsequent.target + +diff --git a/dracut/30ignition/ignition-diskful.target b/dracut/30ignition/ignition-diskful.target +index c59b2175..a15ae54b 100644 +--- a/dracut/30ignition/ignition-diskful.target ++++ b/dracut/30ignition/ignition-diskful.target +@@ -3,7 +3,7 @@ + # Like ignition-complete.target, it only runs on first boot. + [Unit] + Description=Ignition Boot Disk Setup +-Documentation=https://github.com/coreos/ignition ++Documentation=https://github.com/flatcar/ignition + ConditionPathExists=/etc/initrd-release + Before=ignition-complete.target + +diff --git a/dracut/30ignition/ignition-subsequent.target b/dracut/30ignition/ignition-subsequent.target +index 95ae838f..4c734e43 100644 +--- a/dracut/30ignition/ignition-subsequent.target ++++ b/dracut/30ignition/ignition-subsequent.target +@@ -3,7 +3,7 @@ + # different order on the Ignition boot versus "subsequent" boots. + [Unit] + Description=Subsequent (Not Ignition) boot complete +-Documentation=https://github.com/coreos/ignition ++Documentation=https://github.com/flatcar/ignition + ConditionPathExists=/etc/initrd-release + Before=initrd.target + +diff --git a/dracut/30ignition/module-setup.sh b/dracut/30ignition/module-setup.sh +index 15bb7276..816e4b66 100755 +--- a/dracut/30ignition/module-setup.sh ++++ b/dracut/30ignition/module-setup.sh +@@ -52,7 +52,7 @@ install() { + tpm2_createpolicy + + # Required by s390x's z/VM installation. +- # Supporting https://github.com/coreos/ignition/pull/865 ++ # Supporting https://github.com/flatcar/ignition/pull/865 + inst_multiple -o chccwdev vmur + + # Required on system using SELinux diff --git a/go.mod b/go.mod -index 9f92b958..85b3e34e 100644 +index 26182e42..5950d85a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/coreos/ignition/v2 +module github.com/flatcar/ignition/v2 - go 1.18 + go 1.19 diff --git a/internal/apply/apply.go b/internal/apply/apply.go index 33113c5c..e8675889 100644 @@ -4202,6 +4602,31 @@ index 61ca87ae..703385ea 100644 var ( // Device node directories and paths diskByLabelDir = "/dev/disk/by-label" +diff --git a/internal/doc/main.go b/internal/doc/main.go +index ee9024c0..2e83f6ca 100644 +--- a/internal/doc/main.go ++++ b/internal/doc/main.go +@@ -25,13 +25,13 @@ import ( + + "github.com/coreos/go-semver/semver" + +- "github.com/coreos/ignition/v2/config/doc" +- v30 "github.com/coreos/ignition/v2/config/v3_0/types" +- v31 "github.com/coreos/ignition/v2/config/v3_1/types" +- v32 "github.com/coreos/ignition/v2/config/v3_2/types" +- v33 "github.com/coreos/ignition/v2/config/v3_3/types" +- v34 "github.com/coreos/ignition/v2/config/v3_4/types" +- v35 "github.com/coreos/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/config/doc" ++ v30 "github.com/flatcar/ignition/v2/config/v3_0/types" ++ v31 "github.com/flatcar/ignition/v2/config/v3_1/types" ++ v32 "github.com/flatcar/ignition/v2/config/v3_2/types" ++ v33 "github.com/flatcar/ignition/v2/config/v3_3/types" ++ v34 "github.com/flatcar/ignition/v2/config/v3_4/types" ++ v35 "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" + ) + + var ( diff --git a/internal/exec/config_fetcher.go b/internal/exec/config_fetcher.go index 388e1b2a..aecde2a4 100644 --- a/internal/exec/config_fetcher.go @@ -4232,10 +4657,10 @@ index 388e1b2a..aecde2a4 100644 type ConfigFetcher struct { diff --git a/internal/exec/engine.go b/internal/exec/engine.go -index 82b1460e..354de32d 100644 +index 0ae8b985..2c43aced 100644 --- a/internal/exec/engine.go +++ b/internal/exec/engine.go -@@ -23,18 +23,18 @@ import ( +@@ -23,17 +23,17 @@ import ( "time" "github.com/coreos/go-systemd/v22/journal" @@ -4246,7 +4671,6 @@ index 82b1460e..354de32d 100644 - executil "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers" - "github.com/coreos/ignition/v2/internal/providers/cmdline" - "github.com/coreos/ignition/v2/internal/providers/system" - "github.com/coreos/ignition/v2/internal/resource" @@ -4258,7 +4682,6 @@ index 82b1460e..354de32d 100644 + executil "github.com/flatcar/ignition/v2/internal/exec/util" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers" + "github.com/flatcar/ignition/v2/internal/providers/cmdline" + "github.com/flatcar/ignition/v2/internal/providers/system" + "github.com/flatcar/ignition/v2/internal/resource" @@ -4267,12 +4690,12 @@ index 82b1460e..354de32d 100644 "github.com/coreos/vcontext/report" "github.com/coreos/vcontext/validate" diff --git a/internal/exec/stages/disks/disks.go b/internal/exec/stages/disks/disks.go -index a5307fc7..fcc60b88 100644 +index 880fb3b6..4cb055cf 100644 --- a/internal/exec/stages/disks/disks.go +++ b/internal/exec/stages/disks/disks.go -@@ -24,14 +24,14 @@ import ( - "fmt" +@@ -25,14 +25,14 @@ import ( "os/exec" + "path/filepath" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" @@ -4294,7 +4717,7 @@ index a5307fc7..fcc60b88 100644 const ( diff --git a/internal/exec/stages/disks/filesystems.go b/internal/exec/stages/disks/filesystems.go -index 6ba872e9..18103f38 100644 +index d33c1153..62dab634 100644 --- a/internal/exec/stages/disks/filesystems.go +++ b/internal/exec/stages/disks/filesystems.go @@ -25,10 +25,10 @@ import ( @@ -4313,7 +4736,7 @@ index 6ba872e9..18103f38 100644 var ( diff --git a/internal/exec/stages/disks/luks.go b/internal/exec/stages/disks/luks.go -index 42f93041..f87a2be6 100644 +index 5117234e..5783b95a 100644 --- a/internal/exec/stages/disks/luks.go +++ b/internal/exec/stages/disks/luks.go @@ -26,12 +26,12 @@ import ( @@ -4336,7 +4759,7 @@ index 42f93041..f87a2be6 100644 "github.com/vincent-petithory/dataurl" ) diff --git a/internal/exec/stages/disks/partitions.go b/internal/exec/stages/disks/partitions.go -index 839536db..5578ffd7 100644 +index cb55c376..6c1b0af1 100644 --- a/internal/exec/stages/disks/partitions.go +++ b/internal/exec/stages/disks/partitions.go @@ -26,10 +26,10 @@ import ( @@ -4355,12 +4778,12 @@ index 839536db..5578ffd7 100644 var ( diff --git a/internal/exec/stages/disks/raid.go b/internal/exec/stages/disks/raid.go -index fad26e88..41f98a41 100644 +index 795dd42b..d22f604c 100644 --- a/internal/exec/stages/disks/raid.go +++ b/internal/exec/stages/disks/raid.go -@@ -23,9 +23,9 @@ import ( - "fmt" +@@ -24,9 +24,9 @@ import ( "os/exec" + "strings" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" @@ -4437,7 +4860,7 @@ index fb45e966..ea369f0c 100644 "github.com/stretchr/testify/assert" ) diff --git a/internal/exec/stages/files/files.go b/internal/exec/stages/files/files.go -index c2e0c83c..09e2530d 100644 +index d5c04f29..22ca2955 100644 --- a/internal/exec/stages/files/files.go +++ b/internal/exec/stages/files/files.go @@ -19,13 +19,13 @@ import ( @@ -4477,7 +4900,7 @@ index 31741541..5bd23e44 100644 func TestEntrySort(t *testing.T) { diff --git a/internal/exec/stages/files/filesystemEntries.go b/internal/exec/stages/files/filesystemEntries.go -index 915fa563..daf5200a 100644 +index 4df1f00c..1ca48c9a 100644 --- a/internal/exec/stages/files/filesystemEntries.go +++ b/internal/exec/stages/files/filesystemEntries.go @@ -24,11 +24,11 @@ import ( @@ -4497,7 +4920,7 @@ index 915fa563..daf5200a 100644 "github.com/vincent-petithory/dataurl" ) -@@ -443,7 +443,7 @@ func (s stage) getOrderedCreationList(config types.Config) ([]filesystemEntry, e +@@ -459,7 +459,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 @@ -4592,7 +5015,7 @@ index f7980c89..bc4d0663 100644 const ( diff --git a/internal/exec/stages/mount/mount.go b/internal/exec/stages/mount/mount.go -index fd59e80a..8074dbe6 100644 +index 8898bcf0..ecf7ce7f 100644 --- a/internal/exec/stages/mount/mount.go +++ b/internal/exec/stages/mount/mount.go @@ -27,14 +27,14 @@ import ( @@ -4731,7 +5154,7 @@ index a274eae6..0bd57f98 100644 const ( diff --git a/internal/exec/util/unit.go b/internal/exec/util/unit.go -index 8e653de0..f1086974 100644 +index 809507b7..76555d19 100644 --- a/internal/exec/util/unit.go +++ b/internal/exec/util/unit.go @@ -22,8 +22,8 @@ import ( @@ -4776,10 +5199,10 @@ index 4a81f776..bd73adf4 100644 // Util encapsulates logging and destdir indirection for the util methods. diff --git a/internal/main.go b/internal/main.go -index f3de48b6..ce0b03f5 100644 +index 80f85453..9fb31121 100644 --- a/internal/main.go +++ b/internal/main.go -@@ -22,21 +22,21 @@ import ( +@@ -22,15 +22,15 @@ import ( "path/filepath" "time" @@ -4787,133 +5210,106 @@ index f3de48b6..ce0b03f5 100644 - "github.com/coreos/ignition/v2/internal/apply" - "github.com/coreos/ignition/v2/internal/exec" - "github.com/coreos/ignition/v2/internal/exec/stages" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/disks" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/fetch" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/fetch_offline" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/files" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/kargs" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/mount" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/umount" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/platform" +- _ "github.com/coreos/ignition/v2/internal/register" - "github.com/coreos/ignition/v2/internal/state" - "github.com/coreos/ignition/v2/internal/version" + "github.com/flatcar/ignition/v2/config" + "github.com/flatcar/ignition/v2/internal/apply" + "github.com/flatcar/ignition/v2/internal/exec" + "github.com/flatcar/ignition/v2/internal/exec/stages" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/disks" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/fetch" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/fetch_offline" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/files" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/kargs" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/mount" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/umount" + "github.com/flatcar/ignition/v2/internal/log" + "github.com/flatcar/ignition/v2/internal/platform" ++ _ "github.com/flatcar/ignition/v2/internal/register" + "github.com/flatcar/ignition/v2/internal/state" + "github.com/flatcar/ignition/v2/internal/version" "github.com/spf13/pflag" ) diff --git a/internal/platform/platform.go b/internal/platform/platform.go -index 23339439..51bf5174 100644 +index 48d60615..ff31a267 100644 --- a/internal/platform/platform.go +++ b/internal/platform/platform.go -@@ -18,31 +18,31 @@ import ( +@@ -18,11 +18,11 @@ import ( "errors" "fmt" +- "github.com/coreos/ignition/v2/config/v3_5_experimental/types" - "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/providers" -- "github.com/coreos/ignition/v2/internal/providers/aliyun" -- "github.com/coreos/ignition/v2/internal/providers/aws" -- "github.com/coreos/ignition/v2/internal/providers/azure" -- "github.com/coreos/ignition/v2/internal/providers/azurestack" -- "github.com/coreos/ignition/v2/internal/providers/cloudstack" -- "github.com/coreos/ignition/v2/internal/providers/digitalocean" -- "github.com/coreos/ignition/v2/internal/providers/exoscale" -- "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" -- "github.com/coreos/ignition/v2/internal/providers/packet" -- "github.com/coreos/ignition/v2/internal/providers/powervs" -- "github.com/coreos/ignition/v2/internal/providers/qemu" -- "github.com/coreos/ignition/v2/internal/providers/virtualbox" -- "github.com/coreos/ignition/v2/internal/providers/vmware" -- "github.com/coreos/ignition/v2/internal/providers/vultr" -- "github.com/coreos/ignition/v2/internal/providers/zvm" - "github.com/coreos/ignition/v2/internal/registry" - "github.com/coreos/ignition/v2/internal/resource" +- "github.com/coreos/ignition/v2/internal/state" ++ "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" + "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/providers" -+ "github.com/flatcar/ignition/v2/internal/providers/aliyun" -+ "github.com/flatcar/ignition/v2/internal/providers/aws" -+ "github.com/flatcar/ignition/v2/internal/providers/azure" -+ "github.com/flatcar/ignition/v2/internal/providers/azurestack" -+ "github.com/flatcar/ignition/v2/internal/providers/cloudstack" -+ "github.com/flatcar/ignition/v2/internal/providers/digitalocean" -+ "github.com/flatcar/ignition/v2/internal/providers/exoscale" -+ "github.com/flatcar/ignition/v2/internal/providers/file" -+ "github.com/flatcar/ignition/v2/internal/providers/gcp" -+ "github.com/flatcar/ignition/v2/internal/providers/ibmcloud" -+ "github.com/flatcar/ignition/v2/internal/providers/kubevirt" -+ "github.com/flatcar/ignition/v2/internal/providers/noop" -+ "github.com/flatcar/ignition/v2/internal/providers/nutanix" -+ "github.com/flatcar/ignition/v2/internal/providers/openstack" -+ "github.com/flatcar/ignition/v2/internal/providers/packet" -+ "github.com/flatcar/ignition/v2/internal/providers/powervs" -+ "github.com/flatcar/ignition/v2/internal/providers/qemu" -+ "github.com/flatcar/ignition/v2/internal/providers/virtualbox" -+ "github.com/flatcar/ignition/v2/internal/providers/vmware" -+ "github.com/flatcar/ignition/v2/internal/providers/vultr" -+ "github.com/flatcar/ignition/v2/internal/providers/zvm" + "github.com/flatcar/ignition/v2/internal/registry" + "github.com/flatcar/ignition/v2/internal/resource" - ) ++ "github.com/flatcar/ignition/v2/internal/state" - var ( + "github.com/coreos/vcontext/report" + ) diff --git a/internal/providers/aliyun/aliyun.go b/internal/providers/aliyun/aliyun.go -index 8200576e..80d63dcd 100644 +index 4bb6239d..7c343adc 100644 --- a/internal/providers/aliyun/aliyun.go +++ b/internal/providers/aliyun/aliyun.go -@@ -20,9 +20,9 @@ package aliyun +@@ -20,10 +20,10 @@ package aliyun import ( "net/url" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) +diff --git a/internal/providers/applehv/applehv.go b/internal/providers/applehv/applehv.go +index cbb68c66..83aa530a 100644 +--- a/internal/providers/applehv/applehv.go ++++ b/internal/providers/applehv/applehv.go +@@ -22,11 +22,11 @@ import ( + "net/http" + "os/exec" + +- "github.com/coreos/ignition/v2/config/v3_5_experimental/types" +- "github.com/coreos/ignition/v2/internal/distro" +- "github.com/coreos/ignition/v2/internal/platform" +- "github.com/coreos/ignition/v2/internal/providers/util" +- "github.com/coreos/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/platform" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" + "github.com/coreos/vcontext/report" + "github.com/mdlayher/vsock" + ) diff --git a/internal/providers/aws/aws.go b/internal/providers/aws/aws.go -index 21d58bb9..03476927 100644 +index 5ac3dcb6..aefc1d0c 100644 --- a/internal/providers/aws/aws.go +++ b/internal/providers/aws/aws.go -@@ -22,10 +22,10 @@ import ( +@@ -22,11 +22,11 @@ import ( "net/http" "net/url" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" - "github.com/coreos/ignition/v2/internal/log" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" + "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds" -@@ -88,7 +88,7 @@ func Init(f *resource.Fetcher) error { +@@ -98,7 +98,7 @@ func doInit(f *resource.Fetcher) error { // every stage) but that would risk premature timeouts if the // network takes a while to come up. // @@ -4923,10 +5319,10 @@ index 21d58bb9..03476927 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 ec60a350..90815dee 100644 +index d3115f2b..ad26064a 100644 --- a/internal/providers/azure/azure.go +++ b/internal/providers/azure/azure.go -@@ -25,12 +25,12 @@ import ( +@@ -25,13 +25,13 @@ import ( "path/filepath" "time" @@ -4934,19 +5330,21 @@ index ec60a350..90815dee 100644 - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" - execUtil "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/internal/log" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" + execUtil "github.com/flatcar/ignition/v2/internal/exec/util" + "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" "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 65035aa0..dcd6fea3 100644 +index 26334dee..899f2199 100644 --- a/internal/providers/azurestack/azurestack.go +++ b/internal/providers/azurestack/azurestack.go @@ -18,10 +18,10 @@ @@ -4954,40 +5352,43 @@ index 65035aa0..dcd6fea3 100644 import ( - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/azure" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/vcontext/report" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/azure" + "github.com/flatcar/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 b3a2540d..6429f43e 100644 +index 9cc0ec54..dce5d1a2 100644 --- a/internal/providers/cloudstack/cloudstack.go +++ b/internal/providers/cloudstack/cloudstack.go -@@ -30,12 +30,12 @@ import ( +@@ -30,13 +30,13 @@ import ( "strings" "time" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" - ut "github.com/coreos/ignition/v2/internal/util" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" + ut "github.com/flatcar/ignition/v2/internal/util" "github.com/coreos/vcontext/report" ) -@@ -48,7 +48,7 @@ const ( - func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { +@@ -56,7 +56,7 @@ func init() { + func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { // The fetch-offline approach doesn't work well here because of the "split // personality" of this provider. See: - // https://github.com/coreos/ignition/issues/1081 @@ -4996,7 +5397,7 @@ index b3a2540d..6429f43e 100644 return types.Config{}, report.Report{}, resource.ErrNeedNet } diff --git a/internal/providers/cmdline/cmdline.go b/internal/providers/cmdline/cmdline.go -index 42f2fbfb..f09e6fcb 100644 +index 0a279257..eb8e2b45 100644 --- a/internal/providers/cmdline/cmdline.go +++ b/internal/providers/cmdline/cmdline.go @@ -22,12 +22,12 @@ import ( @@ -5006,103 +5407,155 @@ index 42f2fbfb..f09e6fcb 100644 - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/providers" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/providers" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/digitalocean/digitalocean.go b/internal/providers/digitalocean/digitalocean.go -index 4a697db5..e3398a22 100644 +index 67d0a852..943b18a7 100644 --- a/internal/providers/digitalocean/digitalocean.go +++ b/internal/providers/digitalocean/digitalocean.go -@@ -20,9 +20,9 @@ package digitalocean +@@ -20,10 +20,10 @@ package digitalocean import ( "net/url" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/exoscale/exoscale.go b/internal/providers/exoscale/exoscale.go -index bb0153f8..4cacc979 100644 +index 44455acf..53f89d2a 100644 --- a/internal/providers/exoscale/exoscale.go +++ b/internal/providers/exoscale/exoscale.go -@@ -20,9 +20,9 @@ package exoscale +@@ -20,10 +20,10 @@ package exoscale import ( "net/url" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/file/file.go b/internal/providers/file/file.go -index f77d212b..308d4b6c 100644 +index 02244911..4000e11e 100644 --- a/internal/providers/file/file.go +++ b/internal/providers/file/file.go -@@ -17,9 +17,9 @@ package file +@@ -17,10 +17,10 @@ package file import ( "os" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/gcp/gcp.go b/internal/providers/gcp/gcp.go -index b81768a8..742686da 100644 +index c8663614..9b6d41a8 100644 --- a/internal/providers/gcp/gcp.go +++ b/internal/providers/gcp/gcp.go -@@ -21,9 +21,9 @@ import ( +@@ -21,10 +21,10 @@ import ( "net/http" "net/url" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) +diff --git a/internal/providers/hetzner/hetzner.go b/internal/providers/hetzner/hetzner.go +index 34aa9b84..9f7e9a00 100644 +--- a/internal/providers/hetzner/hetzner.go ++++ b/internal/providers/hetzner/hetzner.go +@@ -20,10 +20,10 @@ package hetzner + import ( + "net/url" + +- "github.com/coreos/ignition/v2/config/v3_5_experimental/types" +- "github.com/coreos/ignition/v2/internal/platform" +- "github.com/coreos/ignition/v2/internal/providers/util" +- "github.com/coreos/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/platform" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" + + "github.com/coreos/vcontext/report" + ) +diff --git a/internal/providers/hyperv/kvp.go b/internal/providers/hyperv/kvp.go +index 13e43491..2d6811c7 100644 +--- a/internal/providers/hyperv/kvp.go ++++ b/internal/providers/hyperv/kvp.go +@@ -20,12 +20,12 @@ import ( + "path/filepath" + + "github.com/containers/libhvee/pkg/kvp" +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/v3_5_experimental/types" +- "github.com/coreos/ignition/v2/internal/distro" +- "github.com/coreos/ignition/v2/internal/platform" +- "github.com/coreos/ignition/v2/internal/providers/util" +- "github.com/coreos/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/platform" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" + "github.com/coreos/vcontext/report" + ) + diff --git a/internal/providers/ibmcloud/ibmcloud.go b/internal/providers/ibmcloud/ibmcloud.go -index 82fac9c2..f1f40e4a 100644 +index fb742b92..8a10e271 100644 --- a/internal/providers/ibmcloud/ibmcloud.go +++ b/internal/providers/ibmcloud/ibmcloud.go -@@ -27,12 +27,12 @@ import ( +@@ -27,13 +27,13 @@ import ( "path/filepath" "time" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" - ut "github.com/coreos/ignition/v2/internal/util" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" + ut "github.com/flatcar/ignition/v2/internal/util" @@ -5110,62 +5563,68 @@ index 82fac9c2..f1f40e4a 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/kubevirt/kubevirt.go b/internal/providers/kubevirt/kubevirt.go -index c9ea3994..57beb1ae 100644 +index 88d1e2b6..e5d61d4c 100644 --- a/internal/providers/kubevirt/kubevirt.go +++ b/internal/providers/kubevirt/kubevirt.go -@@ -25,12 +25,12 @@ import ( +@@ -25,13 +25,13 @@ import ( "path/filepath" "time" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" - ut "github.com/coreos/ignition/v2/internal/util" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" + ut "github.com/flatcar/ignition/v2/internal/util" "github.com/coreos/vcontext/report" ) -diff --git a/internal/providers/noop/noop.go b/internal/providers/noop/noop.go -index 74e5a202..4bd5ccdc 100644 ---- a/internal/providers/noop/noop.go -+++ b/internal/providers/noop/noop.go -@@ -17,9 +17,9 @@ - package noop +diff --git a/internal/providers/metal/metal.go b/internal/providers/metal/metal.go +index 1b65c11a..8a5c2362 100644 +--- a/internal/providers/metal/metal.go ++++ b/internal/providers/metal/metal.go +@@ -17,10 +17,10 @@ + package metal import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/nutanix/nutanix.go b/internal/providers/nutanix/nutanix.go -index 47c893aa..a1b901b0 100644 +index 7fbcad58..ef77a5bc 100644 --- a/internal/providers/nutanix/nutanix.go +++ b/internal/providers/nutanix/nutanix.go -@@ -25,12 +25,12 @@ import ( +@@ -25,13 +25,13 @@ import ( "path/filepath" "time" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" - ut "github.com/coreos/ignition/v2/internal/util" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" + ut "github.com/flatcar/ignition/v2/internal/util" @@ -5173,30 +5632,32 @@ index 47c893aa..a1b901b0 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/openstack/openstack.go b/internal/providers/openstack/openstack.go -index c950ea17..2f5bef84 100644 +index 4ef352cf..9a6b6a8a 100644 --- a/internal/providers/openstack/openstack.go +++ b/internal/providers/openstack/openstack.go -@@ -28,12 +28,12 @@ import ( +@@ -28,13 +28,13 @@ import ( "path/filepath" "time" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" - ut "github.com/coreos/ignition/v2/internal/util" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" + ut "github.com/flatcar/ignition/v2/internal/util" "github.com/coreos/vcontext/report" ) -@@ -53,7 +53,7 @@ var ( - func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { +@@ -66,7 +66,7 @@ func init() { + func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { // The fetch-offline approach doesn't work well here because of the "split // personality" of this provider. See: - // https://github.com/coreos/ignition/issues/1081 @@ -5205,100 +5666,95 @@ index c950ea17..2f5bef84 100644 return types.Config{}, report.Report{}, resource.ErrNeedNet } diff --git a/internal/providers/packet/packet.go b/internal/providers/packet/packet.go -index f924367e..8ae3c7d6 100644 +index c2ecbfc1..045e6c5b 100644 --- a/internal/providers/packet/packet.go +++ b/internal/providers/packet/packet.go -@@ -25,9 +25,9 @@ import ( +@@ -25,10 +25,10 @@ import ( "net/url" "strings" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/powervs/powervs.go b/internal/providers/powervs/powervs.go -index c4c4534a..37c4142e 100644 +index 918277a1..fb4ee408 100644 --- a/internal/providers/powervs/powervs.go +++ b/internal/providers/powervs/powervs.go -@@ -24,12 +24,12 @@ import ( +@@ -24,13 +24,13 @@ import ( "path/filepath" "time" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" - ut "github.com/coreos/ignition/v2/internal/util" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" + ut "github.com/flatcar/ignition/v2/internal/util" - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/providers.go b/internal/providers/providers.go -index 4407cab6..0d8283dc 100644 ---- a/internal/providers/providers.go -+++ b/internal/providers/providers.go -@@ -17,9 +17,9 @@ package providers - import ( - "errors" - -- "github.com/coreos/ignition/v2/config/v3_5_experimental/types" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/resource" - "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/qemu/qemu_blockdev.go b/internal/providers/qemu/qemu_blockdev.go -index be923440..659213d4 100644 +index 778a151d..bab0b091 100644 --- a/internal/providers/qemu/qemu_blockdev.go +++ b/internal/providers/qemu/qemu_blockdev.go -@@ -27,10 +27,10 @@ import ( +@@ -27,12 +27,12 @@ import ( "os/exec" "time" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" +- "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/qemu/qemu_fwcfg.go b/internal/providers/qemu/qemu_fwcfg.go -index 57dd39be..f8bf820e 100644 +index 9451981b..a150869f 100644 --- a/internal/providers/qemu/qemu_fwcfg.go +++ b/internal/providers/qemu/qemu_fwcfg.go -@@ -29,9 +29,9 @@ import ( +@@ -29,11 +29,11 @@ import ( "strings" "time" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" +- "github.com/coreos/ignition/v2/internal/distro" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/system/system.go b/internal/providers/system/system.go -index 9e69ab2b..2effacad 100644 +index 8762c2a0..14df30e1 100644 --- a/internal/providers/system/system.go +++ b/internal/providers/system/system.go @@ -18,13 +18,13 @@ import ( @@ -5309,14 +5765,14 @@ index 9e69ab2b..2effacad 100644 - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/providers" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + latest "github.com/flatcar/ignition/v2/config/v3_5_experimental" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/providers" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" @@ -5339,27 +5795,44 @@ index a2a56b7d..efafb416 100644 "github.com/coreos/vcontext/report" ) +diff --git a/internal/providers/util/file.go b/internal/providers/util/file.go +index 054219cb..84f851d0 100644 +--- a/internal/providers/util/file.go ++++ b/internal/providers/util/file.go +@@ -15,8 +15,8 @@ + package util + + import ( +- "github.com/coreos/ignition/v2/config/util" +- "github.com/coreos/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" + + "github.com/vincent-petithory/dataurl" + ) diff --git a/internal/providers/virtualbox/virtualbox.go b/internal/providers/virtualbox/virtualbox.go -index 0bc2fa97..0b71d762 100644 +index dcf18367..bf426e95 100644 --- a/internal/providers/virtualbox/virtualbox.go +++ b/internal/providers/virtualbox/virtualbox.go -@@ -31,10 +31,10 @@ import ( +@@ -31,11 +31,11 @@ import ( "fmt" "unsafe" - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/vmware/vmware_amd64.go b/internal/providers/vmware/vmware_amd64.go -index f7aa3e29..b41b54bc 100644 +index b9777fcd..1d40249c 100644 --- a/internal/providers/vmware/vmware_amd64.go +++ b/internal/providers/vmware/vmware_amd64.go @@ -20,10 +20,10 @@ package vmware @@ -5367,50 +5840,54 @@ index f7aa3e29..b41b54bc 100644 "fmt" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" -- "github.com/coreos/ignition/v2/internal/providers" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/providers" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" "github.com/vmware/vmw-guestinfo/rpcvmx" diff --git a/internal/providers/vmware/vmware_unsupported.go b/internal/providers/vmware/vmware_unsupported.go -index 0adb73ea..a08b56a2 100644 +index a1ea208e..9938e528 100644 --- a/internal/providers/vmware/vmware_unsupported.go +++ b/internal/providers/vmware/vmware_unsupported.go -@@ -23,8 +23,8 @@ package vmware +@@ -23,9 +23,9 @@ package vmware import ( "errors" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/vultr/vultr.go b/internal/providers/vultr/vultr.go -index ac33ea70..4389e49f 100644 +index 496653b9..f5a0904c 100644 --- a/internal/providers/vultr/vultr.go +++ b/internal/providers/vultr/vultr.go -@@ -21,9 +21,9 @@ package vultr +@@ -21,10 +21,10 @@ package vultr import ( "net/url" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/zvm/zvm.go b/internal/providers/zvm/zvm.go -index 9d7e5b91..2d86a041 100644 +index 84f66ec3..d07f1ffc 100644 --- a/internal/providers/zvm/zvm.go +++ b/internal/providers/zvm/zvm.go @@ -24,13 +24,13 @@ import ( @@ -5421,18 +5898,99 @@ index 9d7e5b91..2d86a041 100644 - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" +- "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/vcontext/report" + "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" + "github.com/coreos/vcontext/report" ) - const readerDevice string = "000c" +diff --git a/internal/register/providers.go b/internal/register/providers.go +index ddebb8bb..a3ffb8b0 100644 +--- a/internal/register/providers.go ++++ b/internal/register/providers.go +@@ -15,28 +15,28 @@ + package register + + import ( +- _ "github.com/coreos/ignition/v2/internal/providers/aliyun" +- _ "github.com/coreos/ignition/v2/internal/providers/applehv" +- _ "github.com/coreos/ignition/v2/internal/providers/aws" +- _ "github.com/coreos/ignition/v2/internal/providers/azure" +- _ "github.com/coreos/ignition/v2/internal/providers/azurestack" +- _ "github.com/coreos/ignition/v2/internal/providers/cloudstack" +- _ "github.com/coreos/ignition/v2/internal/providers/digitalocean" +- _ "github.com/coreos/ignition/v2/internal/providers/exoscale" +- _ "github.com/coreos/ignition/v2/internal/providers/file" +- _ "github.com/coreos/ignition/v2/internal/providers/gcp" +- _ "github.com/coreos/ignition/v2/internal/providers/hetzner" +- _ "github.com/coreos/ignition/v2/internal/providers/hyperv" +- _ "github.com/coreos/ignition/v2/internal/providers/ibmcloud" +- _ "github.com/coreos/ignition/v2/internal/providers/kubevirt" +- _ "github.com/coreos/ignition/v2/internal/providers/metal" +- _ "github.com/coreos/ignition/v2/internal/providers/nutanix" +- _ "github.com/coreos/ignition/v2/internal/providers/openstack" +- _ "github.com/coreos/ignition/v2/internal/providers/packet" +- _ "github.com/coreos/ignition/v2/internal/providers/powervs" +- _ "github.com/coreos/ignition/v2/internal/providers/qemu" +- _ "github.com/coreos/ignition/v2/internal/providers/virtualbox" +- _ "github.com/coreos/ignition/v2/internal/providers/vmware" +- _ "github.com/coreos/ignition/v2/internal/providers/vultr" +- _ "github.com/coreos/ignition/v2/internal/providers/zvm" ++ _ "github.com/flatcar/ignition/v2/internal/providers/aliyun" ++ _ "github.com/flatcar/ignition/v2/internal/providers/applehv" ++ _ "github.com/flatcar/ignition/v2/internal/providers/aws" ++ _ "github.com/flatcar/ignition/v2/internal/providers/azure" ++ _ "github.com/flatcar/ignition/v2/internal/providers/azurestack" ++ _ "github.com/flatcar/ignition/v2/internal/providers/cloudstack" ++ _ "github.com/flatcar/ignition/v2/internal/providers/digitalocean" ++ _ "github.com/flatcar/ignition/v2/internal/providers/exoscale" ++ _ "github.com/flatcar/ignition/v2/internal/providers/file" ++ _ "github.com/flatcar/ignition/v2/internal/providers/gcp" ++ _ "github.com/flatcar/ignition/v2/internal/providers/hetzner" ++ _ "github.com/flatcar/ignition/v2/internal/providers/hyperv" ++ _ "github.com/flatcar/ignition/v2/internal/providers/ibmcloud" ++ _ "github.com/flatcar/ignition/v2/internal/providers/kubevirt" ++ _ "github.com/flatcar/ignition/v2/internal/providers/metal" ++ _ "github.com/flatcar/ignition/v2/internal/providers/nutanix" ++ _ "github.com/flatcar/ignition/v2/internal/providers/openstack" ++ _ "github.com/flatcar/ignition/v2/internal/providers/packet" ++ _ "github.com/flatcar/ignition/v2/internal/providers/powervs" ++ _ "github.com/flatcar/ignition/v2/internal/providers/qemu" ++ _ "github.com/flatcar/ignition/v2/internal/providers/virtualbox" ++ _ "github.com/flatcar/ignition/v2/internal/providers/vmware" ++ _ "github.com/flatcar/ignition/v2/internal/providers/vultr" ++ _ "github.com/flatcar/ignition/v2/internal/providers/zvm" + ) +diff --git a/internal/register/stages.go b/internal/register/stages.go +index 98c05214..b8043835 100644 +--- a/internal/register/stages.go ++++ b/internal/register/stages.go +@@ -15,11 +15,11 @@ + package register + + import ( +- _ "github.com/coreos/ignition/v2/internal/exec/stages/disks" +- _ "github.com/coreos/ignition/v2/internal/exec/stages/fetch" +- _ "github.com/coreos/ignition/v2/internal/exec/stages/fetch_offline" +- _ "github.com/coreos/ignition/v2/internal/exec/stages/files" +- _ "github.com/coreos/ignition/v2/internal/exec/stages/kargs" +- _ "github.com/coreos/ignition/v2/internal/exec/stages/mount" +- _ "github.com/coreos/ignition/v2/internal/exec/stages/umount" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/disks" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/fetch" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/fetch_offline" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/files" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/kargs" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/mount" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/umount" + ) diff --git a/internal/resource/http.go b/internal/resource/http.go index 0d8edace..b4b7c59f 100644 --- a/internal/resource/http.go @@ -5509,6 +6067,19 @@ index 29915809..136aca67 100644 ) type Operation struct { +diff --git a/internal/state/state.go b/internal/state/state.go +index 0adff2e8..4d4c42e1 100644 +--- a/internal/state/state.go ++++ b/internal/state/state.go +@@ -20,7 +20,7 @@ import ( + "os" + "path/filepath" + +- "github.com/coreos/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" + ) + + type State struct { diff --git a/internal/util/tools/docs/docs.go b/internal/util/tools/docs/docs.go index ca65069a..41ebf464 100644 --- a/internal/util/tools/docs/docs.go @@ -5549,7 +6120,7 @@ index abac5177..49396b99 100644 func TestAssertValid(t *testing.T) { diff --git a/tests/blackbox_test.go b/tests/blackbox_test.go -index 88de68fb..7914738b 100644 +index 086d6566..52c41c87 100644 --- a/tests/blackbox_test.go +++ b/tests/blackbox_test.go @@ -25,13 +25,13 @@ import ( @@ -5572,10 +6143,10 @@ index 88de68fb..7914738b 100644 // UUID generation tool "github.com/google/uuid" diff --git a/tests/filesystem.go b/tests/filesystem.go -index fa16c44b..9c7a742d 100644 +index 2d9c676b..79797e23 100644 --- a/tests/filesystem.go +++ b/tests/filesystem.go -@@ -29,8 +29,8 @@ import ( +@@ -30,8 +30,8 @@ import ( "strings" "testing" @@ -5917,7 +6488,7 @@ index 03e24ea7..f17efc5a 100644 func init() { diff --git a/tests/positive/filesystems/creation.go b/tests/positive/filesystems/creation.go -index b0f058ee..e5d9dce1 100644 +index 45741945..d4350779 100644 --- a/tests/positive/filesystems/creation.go +++ b/tests/positive/filesystems/creation.go @@ -17,8 +17,8 @@ package filesystems @@ -5947,7 +6518,7 @@ index daa72d7d..2cc76c38 100644 func init() { diff --git a/tests/positive/filesystems/reformat_filesystem.go b/tests/positive/filesystems/reformat_filesystem.go -index 6e58db70..550c3ab3 100644 +index ffa57b10..b83aea03 100644 --- a/tests/positive/filesystems/reformat_filesystem.go +++ b/tests/positive/filesystems/reformat_filesystem.go @@ -15,9 +15,9 @@ @@ -6116,6 +6687,21 @@ index 1488e499..efad6d68 100644 + "github.com/flatcar/ignition/v2/tests/types" ) + func init() { +diff --git a/tests/positive/partitions/wipe.go b/tests/positive/partitions/wipe.go +index da8b34bf..f84e6040 100644 +--- a/tests/positive/partitions/wipe.go ++++ b/tests/positive/partitions/wipe.go +@@ -15,8 +15,8 @@ + package partitions + + import ( +- "github.com/coreos/ignition/v2/tests/register" +- "github.com/coreos/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" + ) + func init() { diff --git a/tests/positive/partitions/zeros.go b/tests/positive/partitions/zeros.go index 10d32990..d53a7bd5 100644 @@ -6355,5 +6941,5 @@ index bec64866..ed027604 100644 var ( -- -2.25.1 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-config-add-ignition-translation.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-config-add-ignition-translation.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch index 6795f5c581..ff9cf7c9cf 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-config-add-ignition-translation.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch @@ -1,7 +1,7 @@ -From d377780c3294d9a7f86d0e02296fffb1084323d1 Mon Sep 17 00:00:00 2001 +From efb34e37bd7e27ef8547e80718f386af0366b22e Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 26 Sep 2022 12:12:04 +0200 -Subject: [PATCH 05/21] config: add ignition translation +Subject: [PATCH 02/21] config: add ignition translation it's a merge from flatcar/ign-converter @@ -2621,5 +2621,5 @@ index 00000000..e81f6bed + } +} -- -2.25.1 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-mod-add-flatcar-ignition-0.36.2.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-mod-add-flatcar-ignition-0.36.2.patch deleted file mode 100644 index 5a74bc8c95..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-mod-add-flatcar-ignition-0.36.2.patch +++ /dev/null @@ -1,45 +0,0 @@ -From b71a858e20878b09149f3b490e204aec738e2ed9 Mon Sep 17 00:00:00 2001 -From: Mathieu Tortuyaux -Date: Fri, 24 Feb 2023 09:13:33 +0100 -Subject: [PATCH 02/21] mod: add flatcar/ignition@0.36.2 - -it's required for Ignition conversion. - -Signed-off-by: Mathieu Tortuyaux ---- - go.mod | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/go.mod b/go.mod -index 85b3e34e..b109532e 100644 ---- a/go.mod -+++ b/go.mod -@@ -10,6 +10,7 @@ require ( - github.com/coreos/go-semver v0.3.1 - github.com/coreos/go-systemd/v22 v22.5.0 - github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 -+ github.com/flatcar/ignition v0.36.2 - github.com/google/renameio/v2 v2.0.0 - github.com/google/uuid v1.3.0 - github.com/pin/tftp v2.1.0+incompatible -@@ -27,7 +28,9 @@ require ( - cloud.google.com/go v0.107.0 // indirect - cloud.google.com/go/compute v1.18.0 // indirect - cloud.google.com/go/iam v0.8.0 // indirect -+ github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 // indirect - github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb // indirect -+ github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/godbus/dbus/v5 v5.0.4 // indirect - github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect -@@ -38,6 +41,7 @@ require ( - github.com/jmespath/go-jmespath v0.4.0 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - go.opencensus.io v0.24.0 // indirect -+ go4.org v0.0.0-20160314031811-03efcb870d84 // indirect - golang.org/x/text v0.7.0 // indirect - golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/appengine v1.6.7 // indirect --- -2.25.1 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch new file mode 100644 index 0000000000..5893338374 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch @@ -0,0 +1,45 @@ +From 9cb0ec3fd1cdaf0eb001e9cf6bdea4b8f21c9544 Mon Sep 17 00:00:00 2001 +From: Mathieu Tortuyaux +Date: Mon, 19 Feb 2024 18:06:06 +0100 +Subject: [PATCH 03/21] mod: add flatcar/ignition@0.36.2 + +it's required for Ignition conversion. + +Signed-off-by: Mathieu Tortuyaux +--- + go.mod | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/go.mod b/go.mod +index 5950d85a..de759536 100644 +--- a/go.mod ++++ b/go.mod +@@ -11,6 +11,7 @@ require ( + github.com/coreos/go-semver v0.3.1 + github.com/coreos/go-systemd/v22 v22.5.0 + github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 ++ github.com/flatcar/ignition v0.36.2 + github.com/google/renameio/v2 v2.0.0 + github.com/google/uuid v1.4.0 + github.com/mdlayher/vsock v1.2.1 +@@ -31,7 +32,9 @@ require ( + cloud.google.com/go v0.110.8 // indirect + cloud.google.com/go/compute v1.23.1 // indirect + cloud.google.com/go/iam v1.1.3 // indirect ++ github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 // indirect + github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb // indirect ++ github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/godbus/dbus/v5 v5.0.4 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect +@@ -44,6 +47,7 @@ require ( + github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + go.opencensus.io v0.24.0 // indirect ++ go4.org v0.0.0-20230225012048-214862532bf5 // indirect + golang.org/x/crypto v0.15.0 // indirect + golang.org/x/sync v0.5.0 // indirect + golang.org/x/text v0.14.0 // indirect +-- +2.43.0 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-sum-go-mod-tidy.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-sum-go-mod-tidy.patch deleted file mode 100644 index 2feeb3fd84..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-sum-go-mod-tidy.patch +++ /dev/null @@ -1,123 +0,0 @@ -From e028524c08935766822c3a1760124a14f6eb090c Mon Sep 17 00:00:00 2001 -From: Mathieu Tortuyaux -Date: Fri, 24 Feb 2023 09:14:03 +0100 -Subject: [PATCH 03/21] sum: go mod tidy - -Signed-off-by: Mathieu Tortuyaux ---- - go.sum | 28 +++++++++++++++++++++++++++- - 1 file changed, 27 insertions(+), 1 deletion(-) - -diff --git a/go.sum b/go.sum -index 087ef0ad..bb95e1fe 100644 ---- a/go.sum -+++ b/go.sum -@@ -11,6 +11,9 @@ cloud.google.com/go/longrunning v0.3.0 h1:NjljC+FYPV3uh5/OwWT6pVU+doBqMg2x/rZlE+ - cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI= - cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4= - github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -+github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 h1:gZCtZ+Hh/e3CGEX8q/yAcp8wWu5ZS6NMk6VGzpQhI3s= -+github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437/go.mod h1:otnto4/Icqn88WCcM4bhIJNSgsh9VLBuspyyCfvof9c= -+github.com/aws/aws-sdk-go v1.8.39/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k= - github.com/aws/aws-sdk-go v1.44.204 h1:7/tPUXfNOHB390A63t6fJIwmlwVQAkAwcbzKsU2/6OQ= - github.com/aws/aws-sdk-go v1.44.204/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= - github.com/beevik/etree v1.1.1-0.20200718192613-4a2f8b9d084c h1:uYq6BD31fkfeNKQmfLj7ODcEfkb5JLsKrXVSqgnfGg8= -@@ -20,8 +23,11 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk - github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= - github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb h1:rmqyI19j3Z/74bIRhuC59RB442rXUazKNueVpfJPxg4= - github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb/go.mod h1:rcFZM3uxVvdyNmsAV2jopgPD1cs5SPWJWU5dOz2LUnw= -+github.com/coreos/go-semver v0.1.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= - github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= - github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= -+github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 h1:3jFq2xL4ZajGK4aZY8jz+DAF0FHjI51BXjjSwCzS1Dk= -+github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= - github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= - github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= - github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 h1:uSmlDgJGbUB0bwQBcZomBTottKwEDF5fF8UjSwKSzWM= -@@ -33,6 +39,10 @@ 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/ignition v0.36.2 h1:xGHgScUe0P4Fkprjqv7L2CE58emiQgP833OCCn9z2v4= -+github.com/flatcar/ignition v0.36.2/go.mod h1:uk1tpzLFRXus4RrvzgMI+IqmmB8a/RGFSBlI+tMTbbA= -+github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= -+github.com/godbus/dbus v0.0.0-20181025153459-66d97aec3384/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= - github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA= - github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -@@ -71,32 +81,45 @@ github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9 - github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= - github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ= - github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= -+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -+github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= - github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= - github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= - github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= - github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -+github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= - github.com/pin/tftp v2.1.0+incompatible h1:Yng4J7jv6lOc6IF4XoB5mnd3P7ZrF60XQq+my3FAMus= - github.com/pin/tftp v2.1.0+incompatible/go.mod h1:xVpZOMCXTy+A5QMjEVN0Glwa1sUvaJhFXbr/aAxuxGY= - github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= - github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= - 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/sigma/bdoor v0.0.0-20160202064022-babf2a4017b0/go.mod h1:WBu7REWbxC/s/J06jsk//d+9DOz9BbsmcIrimuGRFbs= -+github.com/sigma/vmw-guestinfo v0.0.0-20160204083807-95dd4126d6e8/go.mod h1:JrRFFC0veyh0cibh0DAhriSY7/gV3kDdNaVUOmfx01U= -+github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= -+github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM= - github.com/spf13/pflag v1.0.6-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= - github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= - github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= - github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= - github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= - 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.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= - go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= - go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -+go4.org v0.0.0-20160314031811-03efcb870d84 h1:WZkGC1qzoax/QSt84wmvIxk+ZOmGIChsTzdrv9t4nvk= -+go4.org v0.0.0-20160314031811-03efcb870d84/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= - golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= - golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= - golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -@@ -109,6 +132,7 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r - golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= - golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= - golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -+golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= - golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= - golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= - golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -@@ -150,6 +174,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm - golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= - golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= - golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= - golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= - golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= - golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -@@ -190,8 +215,9 @@ google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175 - google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= --gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= - gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= - gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= - gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= --- -2.25.1 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch new file mode 100644 index 0000000000..1545dd7486 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch @@ -0,0 +1,407 @@ +From fd1a7f92a4691d53dd00f7e4ae9e66225368181f Mon Sep 17 00:00:00 2001 +From: Mathieu Tortuyaux +Date: Mon, 19 Feb 2024 18:06:26 +0100 +Subject: [PATCH 04/21] sum: go mod tidy + +Signed-off-by: Mathieu Tortuyaux +--- + go.sum | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 211 insertions(+), 2 deletions(-) + +diff --git a/go.sum b/go.sum +index 504bf0da..5824228b 100644 +--- a/go.sum ++++ b/go.sum +@@ -1,28 +1,55 @@ + cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= ++cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= ++cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= ++cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= ++cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= ++cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= ++cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= ++cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= ++cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= + cloud.google.com/go v0.110.8 h1:tyNdfIxjzaWctIiLYOTalaLKZ17SI44SKFW26QbOhME= + cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk= ++cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= ++cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= + cloud.google.com/go/compute v1.23.1 h1:V97tBoDaZHb6leicZ1G6DLK2BAaZLJ/7+9BB/En3hR0= + cloud.google.com/go/compute v1.23.1/go.mod h1:CqB3xpmPKKt3OJpW2ndFIXnA9A4xAy/F3Xp1ixncW78= + cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= + cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= ++cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= + cloud.google.com/go/iam v1.1.3 h1:18tKG7DzydKWUnLjonWcJO6wjSCAtzh4GcRKlH/Hrzc= + cloud.google.com/go/iam v1.1.3/go.mod h1:3khUlaBXfPKKe7huYgEpDn6FtgRyMEqbkvBxrQyY5SE= ++cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= ++cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= ++cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= ++cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= + cloud.google.com/go/storage v1.35.1 h1:B59ahL//eDfx2IIKFBeT5Atm9wnNmj3+8xG/W4WB//w= + cloud.google.com/go/storage v1.35.1/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8= ++dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= + 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= ++github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 h1:gZCtZ+Hh/e3CGEX8q/yAcp8wWu5ZS6NMk6VGzpQhI3s= ++github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437/go.mod h1:otnto4/Icqn88WCcM4bhIJNSgsh9VLBuspyyCfvof9c= ++github.com/aws/aws-sdk-go v1.8.39/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k= + github.com/aws/aws-sdk-go v1.47.9 h1:rarTsos0mA16q+huicGx0e560aYRtOucV5z2Mw23JRY= + github.com/aws/aws-sdk-go v1.47.9/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= + github.com/beevik/etree v1.2.0 h1:l7WETslUG/T+xOPs47dtd6jov2Ii/8/OjCldk5fYfQw= + github.com/beevik/etree v1.2.0/go.mod h1:aiPf89g/1k3AShMVAzriilpcE4R/Vuor90y83zVZWFc= + github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= ++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= + github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= + github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= + github.com/containers/libhvee v0.4.0 h1:HGHIIExgP2PjwjHKKoQM3B+3qakNIZcmmkiAO4luAZE= + github.com/containers/libhvee v0.4.0/go.mod h1:fyWDxNQccveTdE3Oe+QRuLbwF/iyV0hDxXqRX5Svlic= + github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb h1:rmqyI19j3Z/74bIRhuC59RB442rXUazKNueVpfJPxg4= + github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb/go.mod h1:rcFZM3uxVvdyNmsAV2jopgPD1cs5SPWJWU5dOz2LUnw= ++github.com/coreos/go-semver v0.1.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= + github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= + github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= ++github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= ++github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU= ++github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= + github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= + github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= + github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 h1:uSmlDgJGbUB0bwQBcZomBTottKwEDF5fF8UjSwKSzWM= +@@ -34,16 +61,28 @@ 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/ignition v0.36.2 h1:xGHgScUe0P4Fkprjqv7L2CE58emiQgP833OCCn9z2v4= ++github.com/flatcar/ignition v0.36.2/go.mod h1:uk1tpzLFRXus4RrvzgMI+IqmmB8a/RGFSBlI+tMTbbA= ++github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= ++github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= ++github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= ++github.com/godbus/dbus v0.0.0-20181025153459-66d97aec3384/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= + github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA= + github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= ++github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= ++github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= + github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= + github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= ++github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= ++github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= ++github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= + github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= + github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= + github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= ++github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= + github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= + github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= + github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +@@ -54,6 +93,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw + github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= + github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= + github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= ++github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= ++github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= + github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= + github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= + github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +@@ -62,7 +103,13 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ + github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= + github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= + github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= ++github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= ++github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= + github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= ++github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= ++github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= ++github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= ++github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= + github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg= + github.com/google/renameio/v2 v2.0.0/go.mod h1:BtmJXm5YlszgC+TD4HOEEUFgkJP3nLxehU6hfe7jRt4= + github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= +@@ -72,12 +119,28 @@ github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= + github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= + github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= + github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= ++github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= ++github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= + github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= + github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= ++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= ++github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= + github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= + github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= + github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= + github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= ++github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= ++github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= ++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= ++github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= ++github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= ++github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= ++github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= + github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U= + github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA= + github.com/mdlayher/vsock v1.2.1 h1:pC1mTJTvjo1r9n9fbm7S1j04rCgCzhCOS5DY0zqHlnQ= +@@ -86,16 +149,25 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1 + github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= + github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= + github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= ++github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= + github.com/pin/tftp v2.1.0+incompatible h1:Yng4J7jv6lOc6IF4XoB5mnd3P7ZrF60XQq+my3FAMus= + github.com/pin/tftp v2.1.0+incompatible/go.mod h1:xVpZOMCXTy+A5QMjEVN0Glwa1sUvaJhFXbr/aAxuxGY= + github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= + 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/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk= ++github.com/sigma/bdoor v0.0.0-20160202064022-babf2a4017b0/go.mod h1:WBu7REWbxC/s/J06jsk//d+9DOz9BbsmcIrimuGRFbs= ++github.com/sigma/vmw-guestinfo v0.0.0-20160204083807-95dd4126d6e8/go.mod h1:JrRFFC0veyh0cibh0DAhriSY7/gV3kDdNaVUOmfx01U= ++github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= ++github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM= + github.com/spf13/pflag v1.0.6-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= + github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= + github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= ++github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= ++github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= + github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= + github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= + github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +@@ -103,64 +175,187 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU + github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= + 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.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= ++go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= ++go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= ++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.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= + go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= ++go4.org v0.0.0-20160314031811-03efcb870d84/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= ++go4.org v0.0.0-20230225012048-214862532bf5 h1:nifaUDeh+rPaBCMPMQHZmvJf+QdpLFnuQPwx+LxVmtc= ++go4.org v0.0.0-20230225012048-214862532bf5/go.mod h1:F57wTi5Lrj6WLyswp5EYV1ncrEbFGHD4hhz6S1ZYeaU= + 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= ++golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= + golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= ++golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= + golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= + golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= + golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= ++golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= ++golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= ++golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= ++golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= ++golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= ++golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= ++golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= ++golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= ++golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= + golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= + golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= ++golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= + golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= ++golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= ++golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= ++golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= ++golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= ++golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= ++golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= ++golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= ++golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= ++golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= ++golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= ++golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= ++golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= + golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= + golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++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= ++golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= + golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= + golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= ++golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= ++golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= ++golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= ++golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= + golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= ++golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= ++golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= ++golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= + golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= + golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= + golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= ++golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= ++golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= ++golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= ++golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= + golang.org/x/oauth2 v0.14.0 h1:P0Vrf/2538nmC0H+pEQ3MNFRRnVR7RlqyVw+bvm26z0= + golang.org/x/oauth2 v0.14.0/go.mod h1:lAtNWgaWfL4cm7j2OV8TxGi9Qb7ECORx8DktCY74OwM= + golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= + golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= + golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= + golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= + golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= + golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= + golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= ++golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= ++golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= ++golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= ++golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + 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= + golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= ++golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= ++golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= + golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= + golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= ++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.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= + golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= + golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= + golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= + golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= + golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= ++golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= ++golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= ++golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= ++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= ++golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= ++golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= ++golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= ++golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= ++golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= ++golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= ++golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= ++golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= ++golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= ++golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= ++golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= ++golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= ++golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= ++golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= ++golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= ++golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= ++golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= ++golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= + golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= + golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= + golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= ++google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= ++google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= ++google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= ++google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= ++google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= ++google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= ++google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= ++google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= + google.golang.org/api v0.151.0 h1:FhfXLO/NFdJIzQtCqjpysWwqKk8AzGWBUhMIx67cVDU= + google.golang.org/api v0.151.0/go.mod h1:ccy+MJ6nrYFgE3WgRx/AMXOxOmU8Q4hSa+jjibzhxcg= + google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= + google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= ++google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= ++google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= ++google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= + google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= + google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= + google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= ++google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= ++google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= ++google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= ++google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= ++google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= + google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= ++google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= ++google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= ++google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= ++google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= ++google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= ++google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= + google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b h1:+YaDE2r2OG8t/z5qmsh7Y+XXwCbvadxxZ0YY6mTdrVA= + google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:CgAqfJo+Xmu0GwA0411Ht3OU3OntXwsGmrmjI8ioGXI= +@@ -169,9 +364,13 @@ google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go. + google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 h1:AB/lmRny7e2pLhFEYIbl5qkDAUt2h0ZRO4wGPhZf+ik= + google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE= + google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= ++google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= ++google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= + google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= + google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= ++google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= + google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= ++google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= + google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= + google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= + google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= +@@ -188,12 +387,22 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 + google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= + google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= + google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= + gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= ++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= ++gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= + gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= ++gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= ++gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= + gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= + gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= + honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= ++honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= ++honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= + honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= ++honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= ++rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= ++rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= ++rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +-- +2.43.0 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-vendor-go-mod-vendor.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-vendor-go-mod-vendor.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch index b9f527df62..4ab400dd37 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-vendor-go-mod-vendor.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch @@ -1,7 +1,7 @@ -From 338d08aaa3a001b0c6c9ba07c8c987cde055a8a2 Mon Sep 17 00:00:00 2001 +From 0274c54de01a38d93d1cfdf2a12572d7ecd76500 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Fri, 24 Feb 2023 09:14:24 +0100 -Subject: [PATCH 04/21] vendor: go mod vendor +Date: Mon, 19 Feb 2024 18:06:45 +0100 +Subject: [PATCH 05/21] vendor: go mod vendor Signed-off-by: Mathieu Tortuyaux --- @@ -17029,30 +17029,30 @@ index 00000000..1b1efb0f + return +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index 9b01b083..1e050725 100644 +index d1b9b406..879c8c1c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -20,6 +20,9 @@ cloud.google.com/go/storage cloud.google.com/go/storage/internal cloud.google.com/go/storage/internal/apiv2 - cloud.google.com/go/storage/internal/apiv2/stubs + cloud.google.com/go/storage/internal/apiv2/storagepb +# github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 +## explicit +github.com/ajeddeloh/go-json - # github.com/aws/aws-sdk-go v1.44.204 - ## explicit; go 1.11 + # github.com/aws/aws-sdk-go v1.47.9 + ## explicit; go 1.19 github.com/aws/aws-sdk-go/aws -@@ -82,6 +85,9 @@ github.com/coreos/go-json +@@ -87,6 +90,9 @@ github.com/coreos/go-json # github.com/coreos/go-semver v0.3.1 ## explicit; go 1.8 github.com/coreos/go-semver/semver -+# github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 ++# github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf +## explicit +github.com/coreos/go-systemd/unit # github.com/coreos/go-systemd/v22 v22.5.0 ## explicit; go 1.12 github.com/coreos/go-systemd/v22/dbus -@@ -97,6 +103,27 @@ github.com/coreos/vcontext/validate +@@ -102,6 +108,27 @@ github.com/coreos/vcontext/validate # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew @@ -17080,16 +17080,16 @@ index 9b01b083..1e050725 100644 # github.com/godbus/dbus/v5 v5.0.4 ## explicit; go 1.12 github.com/godbus/dbus/v5 -@@ -179,6 +206,9 @@ go.opencensus.io/trace +@@ -213,6 +240,9 @@ go.opencensus.io/trace go.opencensus.io/trace/internal go.opencensus.io/trace/propagation go.opencensus.io/trace/tracestate -+# go4.org v0.0.0-20160314031811-03efcb870d84 -+## explicit ++# go4.org v0.0.0-20230225012048-214862532bf5 ++## explicit; go 1.13 +go4.org/errorutil - # golang.org/x/net v0.7.0 - ## explicit; go 1.17 - golang.org/x/net/context + # golang.org/x/crypto v0.15.0 + ## explicit; go 1.18 + golang.org/x/crypto/chacha20 -- -2.25.1 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch index 02ca2c1659..75659570c4 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch @@ -1,4 +1,4 @@ -From ddbbaf9d0c3c997b0040d42e79055fc29bd63d19 Mon Sep 17 00:00:00 2001 +From d7119d2744c0f3c0071d5590c563f4a2b0de3162 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 25 May 2022 10:20:09 +0200 Subject: [PATCH 06/21] config/v3_5: convert ignition 2.x to 3.x @@ -72,5 +72,5 @@ index f0d4bb84..dccc5c4c 100644 return Parse(raw) } -- -2.25.1 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch index d7d28e7d2b..90828d3a62 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch @@ -1,18 +1,18 @@ -From 049ed96101d50d0a5303d1b54b3e7fb8e543b513 Mon Sep 17 00:00:00 2001 -From: Mathieu Tortuyaux -Date: Fri, 30 Jul 2021 14:21:31 +0200 +From cb1476e74d19664ed3a175d240610ebe5daed471 Mon Sep 17 00:00:00 2001 +From: Mathieu Tortuyaux +Date: Mon, 19 Feb 2024 18:12:22 +0100 Subject: [PATCH 07/21] internal/prv/cmdline: backport flatcar patch this patch provides backward compatibility for various config key -Signed-off-by: Mathieu Tortuyaux +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 f09e6fcb..b6de99d5 100644 +index eb8e2b45..0561438a 100644 --- a/internal/providers/cmdline/cmdline.go +++ b/internal/providers/cmdline/cmdline.go @@ -33,7 +33,9 @@ import ( @@ -25,8 +25,8 @@ index f09e6fcb..b6de99d5 100644 + cmdlineUrlFlag = "ignition.config.url" ) - func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { -@@ -82,7 +84,7 @@ func parseCmdline(cmdline []byte) (url string) { + var ( +@@ -91,7 +93,7 @@ func parseCmdline(cmdline []byte) (url string) { parts := strings.SplitN(strings.TrimSpace(arg), "=", 2) key := parts[0] @@ -36,5 +36,5 @@ index f09e6fcb..b6de99d5 100644 } -- -2.25.1 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch index 4348f91dcb..8e65f20daf 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch @@ -1,6 +1,6 @@ -From acd94e7ce33771252491f25a0dcb0e45ad5b908a Mon Sep 17 00:00:00 2001 +From 6233a0364d3a7aaa67b66d8d776708b61e7a4457 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Fri, 24 Feb 2023 09:40:01 +0100 +Date: Tue, 20 Feb 2024 10:02:28 +0100 Subject: [PATCH 08/21] provider/qemu: apply fw_cfg patch we support both CoreOS and Flatcar fw_cfg path to ensure compatiblity @@ -11,7 +11,7 @@ Signed-off-by: Mathieu Tortuyaux 1 file changed, 63 insertions(+), 55 deletions(-) diff --git a/internal/providers/qemu/qemu_fwcfg.go b/internal/providers/qemu/qemu_fwcfg.go -index f8bf820e..89515187 100644 +index a150869f..e233865a 100644 --- a/internal/providers/qemu/qemu_fwcfg.go +++ b/internal/providers/qemu/qemu_fwcfg.go @@ -29,6 +29,7 @@ import ( @@ -20,9 +20,9 @@ index f8bf820e..89515187 100644 + iErrors "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" - "github.com/flatcar/ignition/v2/internal/providers/util" - "github.com/flatcar/ignition/v2/internal/resource" -@@ -36,9 +37,11 @@ import ( + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/platform" +@@ -38,9 +39,11 @@ import ( "github.com/coreos/vcontext/report" ) @@ -36,8 +36,8 @@ index f8bf820e..89515187 100644 + } ) - func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { -@@ -48,63 +51,68 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { + func init() { +@@ -57,63 +60,68 @@ func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { return types.Config{}, report.Report{}, err } @@ -56,6 +56,20 @@ index f8bf820e..89515187 100644 - return types.Config{}, report.Report{}, err - } + for cfg, size := range firmwareConfigPaths { ++ // get size of firmware blob, if it exists ++ sizeBytes, err := os.ReadFile(size) ++ if os.IsNotExist(err) { ++ f.Logger.Info("QEMU firmware config was not found. Ignoring...") ++ continue ++ } else if err != nil { ++ f.Logger.Err("couldn't read QEMU firmware config size: %v", err) ++ return types.Config{}, report.Report{}, err ++ } ++ size, err := strconv.Atoi(strings.TrimSpace(string(sizeBytes))) ++ if err != nil { ++ f.Logger.Err("couldn't parse QEMU firmware config size: %v", err) ++ return types.Config{}, report.Report{}, err ++ } - // Read firmware blob. We need to make as few, large read() calls as - // possible, since the qemu_fw_cfg kernel module takes O(offset) @@ -76,21 +90,6 @@ index f8bf820e..89515187 100644 - // if size is correct, we will never call this at an offset - // where it would return io.EOF - n, err := fh.Read(data[len(data):cap(data)]) -+ // get size of firmware blob, if it exists -+ sizeBytes, err := os.ReadFile(size) -+ if os.IsNotExist(err) { -+ f.Logger.Info("QEMU firmware config was not found. Ignoring...") -+ continue -+ } else if err != nil { -+ f.Logger.Err("couldn't read QEMU firmware config size: %v", err) -+ return types.Config{}, report.Report{}, err -+ } -+ size, err := strconv.Atoi(strings.TrimSpace(string(sizeBytes))) -+ if err != nil { -+ f.Logger.Err("couldn't parse QEMU firmware config size: %v", err) -+ return types.Config{}, report.Report{}, err -+ } -+ + // Read firmware blob. We need to make as few, large read() calls as + // possible, since the qemu_fw_cfg kernel module takes O(offset) + // time for each read syscall. os.ReadFile() would eventually @@ -157,7 +156,8 @@ index f8bf820e..89515187 100644 - // of the file so the extra read would be maximally expensive. - return util.ParseConfig(f.Logger, data) + return types.Config{}, report.Report{}, iErrors.ErrEmpty ++ } -- -2.25.1 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-3_5-test-add-ignition-2.x-test-cases.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-3_5-test-add-ignition-2.x-test-cases.patch index cca3eb0330..ed56cafa30 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-3_5-test-add-ignition-2.x-test-cases.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-3_5-test-add-ignition-2.x-test-cases.patch @@ -1,4 +1,4 @@ -From 63e54cff2a72f07ca5c3b15d507c552d681622aa Mon Sep 17 00:00:00 2001 +From 4e6b04bb5ac529732e5814533ab1c0ef0b6c39e7 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 2 Sep 2021 11:03:17 +0200 Subject: [PATCH 09/21] config/3_5/test: add ignition 2.x test cases @@ -40,5 +40,5 @@ index 7e10866e..58423719 100644 in: in{config: []byte(`{"ignition": {"version": "3.0.0"}}`)}, out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}}, -- -2.25.1 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch index 28ffb359b6..1454516337 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch @@ -1,4 +1,4 @@ -From 35d2df7eb82eb83c015aaa714fd66ecddf65282b Mon Sep 17 00:00:00 2001 +From d83920b6c3b3bb186460a6e6fced1f4ed74cae2e Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 22 Sep 2021 14:53:49 +0200 Subject: [PATCH 10/21] internal/disk/fs: ignore fs format mismatches for the @@ -22,7 +22,7 @@ Signed-off-by: Mathieu Tortuyaux 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/exec/stages/disks/filesystems.go b/internal/exec/stages/disks/filesystems.go -index 18103f38..72baf50d 100644 +index 62dab634..2bd2debd 100644 --- a/internal/exec/stages/disks/filesystems.go +++ b/internal/exec/stages/disks/filesystems.go @@ -126,7 +126,7 @@ func (s stage) createFilesystem(fs types.Filesystem) error { @@ -35,5 +35,5 @@ index 18103f38..72baf50d 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.25.1 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch index f7e2497a0a..9c8b02952e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch @@ -1,6 +1,6 @@ -From fb84b45f0499fc2cdc4cb7ea72cc7639bbcf7c98 Mon Sep 17 00:00:00 2001 +From f354144ff3e000e21a1050a03bba3b58f9ade4cb Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Wed, 25 May 2022 10:34:32 +0200 +Date: Tue, 20 Feb 2024 10:12:02 +0100 Subject: [PATCH 11/21] VMware: Fix guestinfo.*.config.data and *.config.url variables MIME-Version: 1.0 @@ -20,12 +20,13 @@ 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 +Signed-off-by: Mathieu Tortuyaux --- - internal/providers/vmware/vmware_amd64.go | 96 +++++++++++++++++------ - 1 file changed, 74 insertions(+), 22 deletions(-) + internal/providers/vmware/vmware_amd64.go | 93 +++++++++++++++++------ + 1 file changed, 71 insertions(+), 22 deletions(-) diff --git a/internal/providers/vmware/vmware_amd64.go b/internal/providers/vmware/vmware_amd64.go -index b41b54bc..5a660b6c 100644 +index 1d40249c..a0833794 100644 --- a/internal/providers/vmware/vmware_amd64.go +++ b/internal/providers/vmware/vmware_amd64.go @@ -19,6 +19,7 @@ package vmware @@ -35,18 +36,16 @@ index b41b54bc..5a660b6c 100644 + "net/url" "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" - "github.com/flatcar/ignition/v2/internal/providers" -@@ -50,26 +51,85 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { - return types.Config{}, report.Report{}, providers.ErrNoProvider + "github.com/flatcar/ignition/v2/internal/platform" +@@ -58,26 +59,83 @@ func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { + return types.Config{}, report.Report{}, platform.ErrNoProvider } - 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 } @@ -129,7 +128,7 @@ index b41b54bc..5a660b6c 100644 ovfEnv, err := info.String(GUESTINFO_OVF, "") if err != nil { -@@ -79,28 +139,20 @@ func fetchRawConfig(f *resource.Fetcher) (config, error) { +@@ -87,28 +145,19 @@ 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) @@ -161,10 +160,9 @@ index b41b54bc..5a660b6c 100644 - encoding: encoding, - }, nil + return data, nil -+ } - func DelConfig(f *resource.Fetcher) error { + func delConfig(f *resource.Fetcher) error { -- -2.25.1 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch index faa1d46c85..39e6df1298 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch @@ -1,4 +1,4 @@ -From 1c6a110cc09e7cc99f760628f70ad2c08acb64bd Mon Sep 17 00:00:00 2001 +From daccef5ca62c3b8b46680b2083cf1e78b626314d Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 2 Feb 2022 13:27:18 +0100 Subject: [PATCH 12/21] config/version: handle configuration version 1 @@ -49,5 +49,5 @@ index 3b9bb22f..f81056fa 100644 return semver.Version{}, report.Report{}, errors.ErrInvalidVersion } -- -2.25.1 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch index 7961fe9126..ed7585e2b3 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch @@ -1,4 +1,4 @@ -From a2ca1caba7445bf93c7bfd5d50c7c4f39054e2c6 Mon Sep 17 00:00:00 2001 +From fca7fd66e1ea504ab884e1c3b88d2956355df4e6 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 22 Feb 2022 15:41:13 +0100 Subject: [PATCH 13/21] config/util: add cloud init detection to initial @@ -90,5 +90,5 @@ index 865d75d2..313d42ea 100644 if err == nil { return report.Report{}, nil -- -2.25.1 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch index f1934d577a..141894b122 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch @@ -1,24 +1,19 @@ -From 469c4eddc01603ae65f7bbbc3e8233e99f4ac902 Mon Sep 17 00:00:00 2001 +From fb939eeea1cbcf1ec47b1eb83f0f0d1d725f3950 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 25 May 2022 10:38:16 +0200 Subject: [PATCH 14/21] Revert "*: drop OEM URI support" This reverts commit 0c088d6de77aa1b1f47b9252a07f51cb1e249df3. --- - config/v3_0/types/url.go | 2 +- - config/v3_1/types/url.go | 2 +- - config/v3_2/types/url.go | 2 +- - config/v3_3/types/url.go | 2 +- - config/v3_4/types/url.go | 2 +- - docs/supported-platforms.md | 1 + - internal/distro/distro.go | 11 +++- - internal/resource/url.go | 92 ++++++++++++++++++++++++++++ - tests/blackbox_test.go | 14 ++++- - tests/negative/files/missing_file.go | 27 ++++++++ - tests/negative/general/config.go | 52 ++++++++++++++++ - tests/positive/files/remote.go | 44 +++++++++++++ - tests/types/types.go | 1 + - 13 files changed, 243 insertions(+), 9 deletions(-) + config/v3_0/types/url.go | 2 +- + config/v3_1/types/url.go | 2 +- + config/v3_2/types/url.go | 2 +- + config/v3_3/types/url.go | 2 +- + config/v3_4/types/url.go | 2 +- + docs/supported-platforms.md | 1 + + internal/distro/distro.go | 11 ++++- + internal/resource/url.go | 92 +++++++++++++++++++++++++++++++++++++ + 8 files changed, 107 insertions(+), 7 deletions(-) diff --git a/config/v3_0/types/url.go b/config/v3_0/types/url.go index 2d8c44b1..f560bc22 100644 @@ -86,10 +81,10 @@ index 9b2b4405..5258c3c6 100644 case "s3": if v, ok := u.Query()["versionId"]; ok { diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md -index 9ecb590a..f7bb4b40 100644 +index 1c9d63bb..39a098dc 100644 --- a/docs/supported-platforms.md +++ b/docs/supported-platforms.md -@@ -10,6 +10,7 @@ Ignition is currently only supported for the following platforms: +@@ -11,6 +11,7 @@ Ignition is currently only supported for the following platforms: * [Amazon Web Services] (`aws`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately. * [Microsoft Azure] (`azure`)- Ignition will read its configuration from the custom data provided to the instance. Cloud SSH keys are handled separately. * [Microsoft Azure Stack] (`azurestack`) - Ignition will read its configuration from the custom data provided to the instance. Cloud SSH keys are handled separately. @@ -274,240 +269,6 @@ index 44253568..3f5fb4ab 100644 + "unmounting %q", oemMountPath, + ) +} -diff --git a/tests/blackbox_test.go b/tests/blackbox_test.go -index 7914738b..2fb15345 100644 ---- a/tests/blackbox_test.go -+++ b/tests/blackbox_test.go -@@ -139,13 +139,19 @@ func outer(t *testing.T, test types.Test, negativeTests bool) error { - return fmt.Errorf("failed to change mode of temp dir: %v", err) - } - -+ oemLookasideDir := filepath.Join(tmpDirectory, "oem-lookaside") - systemConfigDir := filepath.Join(tmpDirectory, "system") - var rootPartition *types.Partition - - // Setup -- err = createFilesFromSlice(systemConfigDir, test.SystemDirFiles) -+ err = createFilesFromSlice(oemLookasideDir, test.OEMLookasideFiles) - // Defer before the error handling because the createFilesFromSlice function - // can fail after partially-creating things -+ defer os.RemoveAll(oemLookasideDir) -+ if err != nil { -+ return err -+ } -+ err = createFilesFromSlice(systemConfigDir, test.SystemDirFiles) - defer os.RemoveAll(systemConfigDir) - if err != nil { - return err -@@ -275,7 +281,11 @@ func outer(t *testing.T, test types.Test, negativeTests bool) error { - - // Ignition - appendEnv := test.Env -- appendEnv = append(appendEnv, "IGNITION_SYSTEM_CONFIG_DIR="+systemConfigDir) -+ appendEnv = append(appendEnv, []string{ -+ "IGNITION_OEM_DEVICE=" + test.In[0].Partitions.GetPartition("OEM").Device, -+ "IGNITION_OEM_LOOKASIDE_DIR=" + oemLookasideDir, -+ "IGNITION_SYSTEM_CONFIG_DIR=" + systemConfigDir, -+ }...) - - if !negativeTests { - if err := runIgnition(t, ctx, "fetch", "", tmpDirectory, appendEnv); err != nil { -diff --git a/tests/negative/files/missing_file.go b/tests/negative/files/missing_file.go -index 251f5593..4f6a9801 100644 ---- a/tests/negative/files/missing_file.go -+++ b/tests/negative/files/missing_file.go -@@ -23,6 +23,7 @@ func init() { - register.Register(register.NegativeTest, MissingRemoteContentsHTTP()) - register.Register(register.NegativeTest, InvalidHeaderRemoteContentsHTTP()) - register.Register(register.NegativeTest, MissingRemoteContentsTFTP()) -+ register.Register(register.NegativeTest, MissingRemoteContentsOEM()) - } - - func MissingRemoteContentsHTTP() types.Test { -@@ -103,3 +104,29 @@ func MissingRemoteContentsTFTP() types.Test { - ConfigMinVersion: configMinVersion, - } - } -+ -+func MissingRemoteContentsOEM() types.Test { -+ name := "Create Files from Remote Contents - OEM" -+ in := types.GetBaseDisk() -+ out := in -+ config := `{ -+ "ignition": { "version": "$version" }, -+ "storage": { -+ "files": [{ -+ "path": "/foo/bar", -+ "contents": { -+ "source": "oem:///source" -+ } -+ }] -+ } -+ }` -+ configMinVersion := "3.0.0-experimental" -+ -+ return types.Test{ -+ Name: name, -+ In: in, -+ Out: out, -+ Config: config, -+ ConfigMinVersion: configMinVersion, -+ } -+} -diff --git a/tests/negative/general/config.go b/tests/negative/general/config.go -index 6fcabe80..6d3cf848 100644 ---- a/tests/negative/general/config.go -+++ b/tests/negative/general/config.go -@@ -29,12 +29,14 @@ func init() { - register.Register(register.NegativeTest, ReplaceConfigWithMissingFileHTTP()) - register.Register(register.NegativeTest, ReplaceConfigWithInvalidHeaderHTTP()) - register.Register(register.NegativeTest, ReplaceConfigWithMissingFileTFTP()) -+ register.Register(register.NegativeTest, ReplaceConfigWithMissingFileOEM()) - register.Register(register.NegativeTest, AppendConfigWithMissingFileHTTP()) - register.Register(register.NegativeTest, AppendConfigWithInvalidHeaderHTTP()) - register.Register(register.NegativeTest, AppendConfigWithMissingFileTFTP()) - register.Register(register.NegativeTest, VersionOnlyConfig25()) - register.Register(register.NegativeTest, VersionOnlyConfig35()) - register.Register(register.NegativeTest, MergingCanFail()) -+ register.Register(register.NegativeTest, AppendConfigWithMissingFileOEM()) - } - - func ReplaceConfigWithInvalidHash() types.Test { -@@ -185,6 +187,31 @@ func ReplaceConfigWithMissingFileTFTP() types.Test { - } - } - -+func ReplaceConfigWithMissingFileOEM() types.Test { -+ name := "Replace Config with Missing File - OEM" -+ in := types.GetBaseDisk() -+ out := in -+ config := `{ -+ "ignition": { -+ "version": "$version", -+ "config": { -+ "replace": { -+ "source": "oem:///asdf" -+ } -+ } -+ } -+ }` -+ configMinVersion := "3.0.0-experimental" -+ -+ return types.Test{ -+ Name: name, -+ In: in, -+ Out: out, -+ Config: config, -+ ConfigMinVersion: configMinVersion, -+ } -+} -+ - func AppendConfigWithMissingFileHTTP() types.Test { - name := "config.merge.http.notfound" - in := types.GetBaseDisk() -@@ -261,6 +288,31 @@ func AppendConfigWithMissingFileTFTP() types.Test { - } - } - -+func AppendConfigWithMissingFileOEM() types.Test { -+ name := "Append Config with Missing File - OEM" -+ in := types.GetBaseDisk() -+ out := in -+ config := `{ -+ "ignition": { -+ "version": "$version", -+ "config": { -+ "append": [{ -+ "source": "oem:///asdf" -+ }] -+ } -+ } -+ }` -+ configMinVersion := "3.0.0-experimental" -+ -+ return types.Test{ -+ Name: name, -+ In: in, -+ Out: out, -+ Config: config, -+ ConfigMinVersion: configMinVersion, -+ } -+} -+ - func VersionOnlyConfig25() types.Test { - name := "config.version.2.5.0-exp" - in := types.GetBaseDisk() -diff --git a/tests/positive/files/remote.go b/tests/positive/files/remote.go -index 792bdae7..9117e651 100644 ---- a/tests/positive/files/remote.go -+++ b/tests/positive/files/remote.go -@@ -29,6 +29,7 @@ func init() { - register.Register(register.PositiveTest, CreateFileFromRemoteContentsHTTPUsingHeadersWithRedirect()) - register.Register(register.PositiveTest, CreateFileFromRemoteContentsHTTPUsingOverwrittenHeaders()) - register.Register(register.PositiveTest, CreateFileFromRemoteContentsTFTP()) -+ register.Register(register.PositiveTest, CreateFileFromRemoteContentsOEM()) - } - - func CreateFileFromRemoteContentsHTTP() types.Test { -@@ -252,3 +253,46 @@ func CreateFileFromRemoteContentsTFTP() types.Test { - ConfigMinVersion: configMinVersion, - } - } -+ -+func CreateFileFromRemoteContentsOEM() types.Test { -+ name := "Create Files from Remote Contents - OEM" -+ in := types.GetBaseDisk() -+ out := types.GetBaseDisk() -+ config := `{ -+ "ignition": { "version": "$version" }, -+ "storage": { -+ "files": [{ -+ "path": "/foo/bar", -+ "contents": { -+ "source": "oem:///source" -+ } -+ }] -+ } -+ }` -+ in[0].Partitions.AddFiles("OEM", []types.File{ -+ { -+ Node: types.Node{ -+ Name: "source", -+ }, -+ Contents: "asdf\nfdsa", -+ }, -+ }) -+ out[0].Partitions.AddFiles("ROOT", []types.File{ -+ { -+ Node: types.Node{ -+ Name: "bar", -+ Directory: "foo", -+ }, -+ Contents: "asdf\nfdsa", -+ }, -+ }) -+ configMinVersion := "3.0.0-experimental" -+ -+ return types.Test{ -+ Name: name, -+ In: in, -+ Out: out, -+ Config: config, -+ ConfigMinVersion: configMinVersion, -+ } -+} -diff --git a/tests/types/types.go b/tests/types/types.go -index d5bd3fe7..ea4ff6ab 100644 ---- a/tests/types/types.go -+++ b/tests/types/types.go -@@ -97,6 +97,7 @@ type Test struct { - In []Disk // Disk state before running Ignition - Out []Disk // Expected disk state after running Ignition - MntDevices []MntDevice -+ OEMLookasideFiles []File - SystemDirFiles []File - Env []string // Environment variables for Ignition - Config string -- -2.25.1 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch index a0729fb205..30fcee79f6 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch @@ -1,4 +1,4 @@ -From c38cba8cd7303ec1d2d2559ba4e34fc52f1ca84a Mon Sep 17 00:00:00 2001 +From d2c70466cfcfa9c0f4f8ef1bd247e6c36874f1b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Wed, 7 Jul 2021 18:40:52 +0200 Subject: [PATCH 15/21] internal/resource/url: support btrfs as OEM partition @@ -35,5 +35,5 @@ index 3f5fb4ab..3fbda7a7 100644 return nil -- -2.25.1 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-internal-exec-stages-disks-prevent-races-with-udev.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-internal-exec-stages-disks-prevent-races-with-udev.patch deleted file mode 100644 index e19e4c4917..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-internal-exec-stages-disks-prevent-races-with-udev.patch +++ /dev/null @@ -1,197 +0,0 @@ -From f39a78c6a9dd787c31fe02fbf098150b87c8cbc7 Mon Sep 17 00:00:00 2001 -From: Kai Lueke -Date: Fri, 11 Feb 2022 15:41:12 +0100 -Subject: [PATCH 16/21] 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 -where udev didn't get notified yet of the final event to wait for. -This caused the boot with a btrfs root filesystem created by Ignition -to fail almost every time on certain hardware. - -Issue tagged events and wait for them to be processed by udev. This is -actually meanigful in all stages not only for the other parts of the -initramfs which may be surprised by sudden device nodes disappearing -shortly like the case was with systemd's fsck service but also for the -inter-stage dependencies which currently are using the waiter for -systemd device units but that doesn't really prevent from races with -udev device node recreation. Thus, these changes are complementary to -the existing waiter which mainly has the purpose to wait for unmodified -devices. For newly created RAIDs we can wait for the new node to be -available as udev will not recreate it. -Note: This is a port for Ignition 0.35 while for 2.2 this also should -be done for LUKS. ---- - internal/exec/stages/disks/disks.go | 63 ++++++++++++----------- - internal/exec/stages/disks/filesystems.go | 23 +++++++++ - internal/exec/stages/disks/partitions.go | 9 ++++ - internal/exec/stages/disks/raid.go | 12 +++++ - 4 files changed, 78 insertions(+), 29 deletions(-) - -diff --git a/internal/exec/stages/disks/disks.go b/internal/exec/stages/disks/disks.go -index fcc60b88..7baca8fc 100644 ---- a/internal/exec/stages/disks/disks.go -+++ b/internal/exec/stages/disks/disks.go -@@ -23,6 +23,7 @@ import ( - "errors" - "fmt" - "os/exec" -+ "path/filepath" - - "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" - "github.com/flatcar/ignition/v2/internal/distro" -@@ -106,35 +107,39 @@ func (s stage) Run(config types.Config) error { - return fmt.Errorf("failed to create filesystems: %v", err) - } - -- // udevd registers an IN_CLOSE_WRITE inotify watch on block device -- // nodes, and synthesizes udev "change" events when the watch fires. -- // mkfs.btrfs triggers multiple such events, the first of which -- // occurs while there is no recognizable filesystem on the -- // partition. Thus, if an existing partition is reformatted as -- // btrfs while keeping the same filesystem label, there will be a -- // synthesized uevent that deletes the /dev/disk/by-label symlink -- // and a second one that restores it. If we didn't account for this, -- // a systemd unit that depended on the by-label symlink (e.g. -- // systemd-fsck-root.service) could have the symlink deleted out -- // from under it. -- // -- // There's no way to fix this completely. We can't wait for the -- // restoring uevent to propagate, since we can't determine which -- // specific uevents were triggered by the mkfs. We can wait for -- // udev to settle, though it's conceivable that the deleting uevent -- // has already been processed and the restoring uevent is still -- // sitting in the inotify queue. In practice the uevent queue will -- // be the slow one, so this should be good enough. -- // -- // Test case: boot failure in coreos.ignition.*.btrfsroot kola test. -- // -- // Additionally, partitioning (and possibly creating raid) suffers -- // the same problem. To be safe, always settle. -- if _, err := s.Logger.LogCmd( -- exec.Command(distro.UdevadmCmd(), "settle"), -- "waiting for udev to settle", -- ); err != nil { -- return fmt.Errorf("udevadm settle failed: %v", err) -+ return nil -+} -+ -+// waitForUdev triggers a tagged event and waits for it to bubble up -+// again. This ensures that udev processed the device changes. -+// The requirement is that the used device path exists and itself is -+// not recreated by udev seeing the changes done. Thus, resolve a -+// /dev/disk/by-something/X symlink before performing the device -+// changes (i.e., pass /run/ignition/dev_aliases/X) and, e.g., don't -+// call it for a partition but the full disk if you modified the -+// partition table. -+func (s stage) waitForUdev(dev, ctxt string) error { -+ // Resolve the original /dev/ABC entry because udevadm wants -+ // this as argument instead of a symlink like -+ // /run/ignition/dev_aliases/X. -+ devPath, err := filepath.EvalSymlinks(dev) -+ if err != nil { -+ return fmt.Errorf("failed to resolve device alias %q on %s: %v", dev, ctxt, err) -+ } -+ // By triggering our own event and waiting for it we know that udev -+ // will have processed the device changes, a bare "udevadm settle" -+ // is prone to races with the inotify queue. We expect the /dev/DISK -+ // entry to exist because this function is either called for the full -+ // disk and only the /dev/DISKpX partition entries will change, or the -+ // function is called for a partition where the contents changed and -+ // nothing causes the kernel/udev to reread the partition table and -+ // recreate the /dev/DISKpX entries. If that was the case best we could -+ // do here is to add a retry loop (and relax the function comment). -+ _, err = s.Logger.LogCmd( -+ exec.Command(distro.UdevadmCmd(), "trigger", "--settle", -+ devPath), "waiting for triggered uevent") -+ if err != nil { -+ return fmt.Errorf("udevadm trigger failed on %s: %v", ctxt, err) - } - - return nil -diff --git a/internal/exec/stages/disks/filesystems.go b/internal/exec/stages/disks/filesystems.go -index 72baf50d..67fec316 100644 ---- a/internal/exec/stages/disks/filesystems.go -+++ b/internal/exec/stages/disks/filesystems.go -@@ -210,6 +210,29 @@ func (s stage) createFilesystem(fs types.Filesystem) error { - return fmt.Errorf("mkfs failed: %v", err) - } - -+ // udevd registers an IN_CLOSE_WRITE inotify watch on block device -+ // nodes, and synthesizes udev "change" events when the watch fires. -+ // mkfs.btrfs triggers multiple such events, the first of which -+ // occurs while there is no recognizable filesystem on the -+ // partition. Thus, if an existing partition is reformatted as -+ // btrfs while keeping the same filesystem label, there will be a -+ // synthesized uevent that deletes the /dev/disk/by-label symlink -+ // and a second one that restores it. If we didn't account for this, -+ // a systemd unit that depended on the by-label symlink (e.g. -+ // systemd-fsck-root.service) could have the symlink deleted out -+ // from under it. -+ // Trigger a tagged uevent and wait for it because a bare "udevadm -+ // settle" does not guarantee that all changes were processed -+ // because it's conceivable that only the deleting uevent has -+ // already been processed (or none!) while the restoring uevent -+ // is still sitting in the inotify queue. By triggering our own -+ // event and waiting for it we know that udev will have processed -+ // the device changes. -+ // Test case: boot failure in coreos.ignition.*.btrfsroot kola test. -+ if err := s.waitForUdev(devAlias, "createFilesystems"); err != nil { -+ return err -+ } -+ - return nil - } - -diff --git a/internal/exec/stages/disks/partitions.go b/internal/exec/stages/disks/partitions.go -index 5578ffd7..747f08dc 100644 ---- a/internal/exec/stages/disks/partitions.go -+++ b/internal/exec/stages/disks/partitions.go -@@ -394,5 +394,14 @@ func (s stage) partitionDisk(dev types.Disk, devAlias string) error { - if err := op.Commit(); err != nil { - return fmt.Errorf("commit failure: %v", err) - } -+ -+ // It's best to wait here for the /dev/ABC entries to be -+ // (re)created, not only for other parts of the initramfs but -+ // also because s.waitOnDevices() can still race with udev's -+ // partition entry recreation. -+ if err := s.waitForUdev(devAlias, "createPartitions"); err != nil { -+ return err -+ } -+ - return nil - } -diff --git a/internal/exec/stages/disks/raid.go b/internal/exec/stages/disks/raid.go -index 41f98a41..d22f604c 100644 ---- a/internal/exec/stages/disks/raid.go -+++ b/internal/exec/stages/disks/raid.go -@@ -22,6 +22,7 @@ package disks - import ( - "fmt" - "os/exec" -+ "strings" - - "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" - "github.com/flatcar/ignition/v2/internal/distro" -@@ -78,6 +79,17 @@ func (s stage) createRaids(config types.Config) error { - ); err != nil { - return fmt.Errorf("mdadm failed: %v", err) - } -+ -+ devName := md.Name -+ if !strings.HasPrefix(devName, "/dev") { -+ devName = "/dev/md/" + md.Name -+ } -+ // Wait for the created device node to show up, no udev -+ // race prevention required because this node did not -+ // exist before. -+ if err := s.waitOnDevices([]string{devName}, "raids"); err != nil { -+ return err -+ } - } - - return nil --- -2.25.1 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-translation-support-OEM-and-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch similarity index 97% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-translation-support-OEM-and-oem.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch index 8f33ffdf0b..cba20643c7 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-translation-support-OEM-and-oem.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch @@ -1,7 +1,7 @@ -From cf5ed759582236d6935eb9ab167f46671a7c038d Mon Sep 17 00:00:00 2001 +From ae61d536613332251f033e613ff6775e937378a8 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 10 Nov 2022 11:58:49 +0100 -Subject: [PATCH 17/21] translation: support OEM and oem +Subject: [PATCH 16/21] translation: support OEM and oem Signed-off-by: Mathieu Tortuyaux --- @@ -157,5 +157,5 @@ index e81f6bed..68c07109 100644 + } +} -- -2.25.1 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch new file mode 100644 index 0000000000..0524134692 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch @@ -0,0 +1,46 @@ +From ae8a57a3b86eb03152cee167bbbcb245075b8590 Mon Sep 17 00:00:00 2001 +From: Mathieu Tortuyaux +Date: Tue, 20 Feb 2024 10:25:24 +0100 +Subject: [PATCH 17/21] revert: internal/oem: drop noop OEMs + +This reverts: https://github.com/flatcar/ignition/commit/26828f92e00060aa8ebf2197545ad602af237132 + +Signed-off-by: Mathieu Tortuyaux +--- + internal/providers/metal/metal.go | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/internal/providers/metal/metal.go b/internal/providers/metal/metal.go +index 8a5c2362..9b764e09 100644 +--- a/internal/providers/metal/metal.go ++++ b/internal/providers/metal/metal.go +@@ -26,10 +26,26 @@ import ( + ) + + func init() { ++ platform.Register(platform.Provider{ ++ Name: "cloudsigma", ++ Fetch: fetchConfig, ++ }) + platform.Register(platform.Provider{ + Name: "metal", + Fetch: fetchConfig, + }) ++ platform.Register(platform.Provider{ ++ Name: "rackspace", ++ Fetch: fetchConfig, ++ }) ++ platform.Register(platform.Provider{ ++ Name: "rackspace-onmetal", ++ Fetch: fetchConfig, ++ }) ++ platform.Register(platform.Provider{ ++ Name: "vagrant", ++ Fetch: fetchConfig, ++ }) + } + + func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { +-- +2.43.0 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch similarity index 68% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch index 8448a8dd53..09bf3a3849 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch @@ -1,30 +1,27 @@ -From 8848eb28f78750b16cd503f64279847a5e2681ae Mon Sep 17 00:00:00 2001 -From: Krzesimir Nowak -Date: Fri, 14 Apr 2023 11:37:20 +0200 -Subject: [PATCH 19/21] docs: Add re-added platforms to docs to pass tests +From 56f6c13df51715305100f306f31a65018e3bbea4 Mon Sep 17 00:00:00 2001 +From: Mathieu Tortuyaux +Date: Tue, 20 Feb 2024 10:27:21 +0100 +Subject: [PATCH 18/21] docs: Add re-added platforms to docs to pass tests +Signed-off-by: Mathieu Tortuyaux +Co-Authored-By: Krzesimir Nowak --- - docs/supported-platforms.md | 5 +++++ - 1 file changed, 5 insertions(+) + docs/supported-platforms.md | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md -index f7bb4b40..eb5db00f 100644 +index 39a098dc..deff10af 100644 --- a/docs/supported-platforms.md +++ b/docs/supported-platforms.md -@@ -12,10 +12,12 @@ Ignition is currently only supported for the following platforms: - * [Microsoft Azure Stack] (`azurestack`) - Ignition will read its configuration from the custom data provided to the instance. Cloud SSH keys are handled separately. +@@ -14,6 +14,7 @@ Ignition is currently only supported for the following platforms: * Bare Metal - Use the `ignition.config.url` kernel parameter to provide a URL to the configuration. The URL can use the `http://`, `https://`, `tftp://`, `s3://`, or `gs://` schemes to specify a remote config or the `oem://` scheme to specify a local config, rooted in `/usr/share/oem`. * [Brightbox] (`brightbox`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately. -+* `cloudsigma` - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately. * [CloudStack] (`cloudstack`) - Ignition will read its configuration from the instance userdata via either metadata service or config drive. Cloud SSH keys are handled separately. ++* `cloudsigma` - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately. * [DigitalOcean] (`digitalocean`) - Ignition will read its configuration from the droplet userdata. Cloud SSH keys and network configuration are handled separately. * [Exoscale] (`exoscale`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately. * [Google Cloud] (`gcp`) - Ignition will read its configuration from the instance metadata entry named "user-data". Cloud SSH keys are handled separately. -+* `hyperv` - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately. - * [IBM Cloud] (`ibmcloud`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately. - * [KubeVirt] (`kubevirt`) - Ignition will read its configuration from the instance userdata via config drive. Cloud SSH keys are handled separately. - * Bare Metal (`metal`) - Use the `ignition.config.url` kernel parameter to provide a URL to the configuration. The URL can use the `http://`, `https://`, `tftp://`, `s3://`, `arn:`, or `gs://` schemes to specify a remote config. -@@ -24,6 +26,9 @@ Ignition is currently only supported for the following platforms: +@@ -27,6 +28,9 @@ Ignition is currently only supported for the following platforms: * [Equinix Metal] (`packet`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately. * [IBM Power Systems Virtual Server] (`powervs`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately. * [QEMU] (`qemu`) - Ignition will read its configuration from the 'opt/com.coreos/config' key on the QEMU Firmware Configuration Device (available in QEMU 2.4.0 and higher). @@ -35,5 +32,5 @@ index f7bb4b40..eb5db00f 100644 * [VMware] (`vmware`) - Use the VMware Guestinfo variables `ignition.config.data` and `ignition.config.data.encoding` to provide the config and its encoding to the virtual machine. Valid encodings are "", "base64", and "gzip+base64". Guestinfo variables can be provided directly or via an OVF environment, with priority given to variables specified directly. * [Vultr] (`vultr`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately. -- -2.25.1 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-revert-internal-oem-drop-noop-OEMs.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-revert-internal-oem-drop-noop-OEMs.patch deleted file mode 100644 index d8392d031d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-revert-internal-oem-drop-noop-OEMs.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 8e7ad5ef7ea79d541d8f960f2647a5cd17e72751 Mon Sep 17 00:00:00 2001 -From: Mathieu Tortuyaux -Date: Wed, 21 Dec 2022 17:25:02 +0100 -Subject: [PATCH 18/21] revert: internal/oem: drop noop OEMs - -This reverts: https://github.com/coreos/ignition/commit/26828f92e00060aa8ebf2197545ad602af237132 - -Signed-off-by: Mathieu Tortuyaux ---- - internal/platform/platform.go | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/internal/platform/platform.go b/internal/platform/platform.go -index 51bf5174..5ed36663 100644 ---- a/internal/platform/platform.go -+++ b/internal/platform/platform.go -@@ -132,6 +132,10 @@ func init() { - name: "brightbox", - fetch: openstack.FetchConfig, - }) -+ configs.Register(Config{ -+ name: "cloudsigma", -+ fetch: noop.FetchConfig, -+ }) - configs.Register(Config{ - name: "cloudstack", - fetch: cloudstack.FetchConfig, -@@ -152,6 +156,10 @@ func init() { - name: "gcp", - fetch: gcp.FetchConfig, - }) -+ configs.Register(Config{ -+ name: "hyperv", -+ fetch: noop.FetchConfig, -+ }) - configs.Register(Config{ - name: "ibmcloud", - fetch: ibmcloud.FetchConfig, -@@ -185,6 +193,18 @@ func init() { - name: "qemu", - fetch: qemu.FetchConfig, - }) -+ configs.Register(Config{ -+ name: "rackspace", -+ fetch: noop.FetchConfig, -+ }) -+ configs.Register(Config{ -+ name: "rackspace-onmetal", -+ fetch: noop.FetchConfig, -+ }) -+ configs.Register(Config{ -+ name: "vagrant", -+ fetch: noop.FetchConfig, -+ }) - configs.Register(Config{ - name: "virtualbox", - fetch: virtualbox.FetchConfig, --- -2.25.1 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-usr-share-oem-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-usr-share-oem-oem.patch new file mode 100644 index 0000000000..2944133d1d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-usr-share-oem-oem.patch @@ -0,0 +1,42 @@ +From 9be71387c9b0ff2681f3f4902f508f9071cae988 Mon Sep 17 00:00:00 2001 +From: Krzesimir Nowak +Date: Tue, 4 Apr 2023 12:12:42 +0200 +Subject: [PATCH 19/21] /usr/share/oem -> /oem + +--- + config/util/translate.go | 2 +- + internal/distro/distro.go | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/config/util/translate.go b/config/util/translate.go +index 347d148c..d4c057b2 100644 +--- a/config/util/translate.go ++++ b/config/util/translate.go +@@ -154,7 +154,7 @@ func FSGeneration(name string, fsMap map[string]string) (string, error) { + if _, ok := fsMap[name]; !ok { + addedSuffixCounter += 1 + if name == "oem" { +- fsMap[name] = "/usr/share/oem" ++ fsMap[name] = "/oem" + } else { + // generate a new path + fsMap[name] = "/tmp/" + name + "-ign" + strconv.FormatUint(addedSuffixCounter, 10) +diff --git a/internal/distro/distro.go b/internal/distro/distro.go +index 644c42c4..9e96166e 100644 +--- a/internal/distro/distro.go ++++ b/internal/distro/distro.go +@@ -32,7 +32,10 @@ var ( + bootIDPath = "/proc/sys/kernel/random/boot_id" + // initramfs directory containing distro-provided base config + systemConfigDir = "/usr/lib/ignition" +- // initramfs directory to check before retrieving file from OEM partition ++ // initramfs directory to check before retrieving file from ++ // OEM partition; note that OEM partition is mounted on /oem ++ // on the host, but initrds still use /usr/share/oem for ++ // backwards compatilibity + oemLookasideDir = "/usr/share/oem" + + // Helper programs +-- +2.43.0 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-internal-exec-stages-mount-Mount-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch similarity index 88% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-internal-exec-stages-mount-Mount-oem.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch index 8d8a4cc81a..f0170e76f5 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-internal-exec-stages-mount-Mount-oem.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch @@ -1,7 +1,7 @@ -From 3adef6a01c987ed2156636fab1791e534f770621 Mon Sep 17 00:00:00 2001 +From 6589dccde4a36ea42e38e410ca710e0034d6454a Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 May 2023 17:43:43 +0200 -Subject: [PATCH 21/21] internal/exec/stages/mount: Mount /oem +Subject: [PATCH 20/21] internal/exec/stages/mount: Mount /oem When asking to mount the OEM partition to /usr/share/oem, actually mount it in /oem. The /usr/share/oem is a symlink pointing to /oem, so @@ -12,7 +12,7 @@ into /usr/share/oem, should end up having things in /oem. 1 file changed, 5 insertions(+) diff --git a/internal/exec/stages/mount/mount.go b/internal/exec/stages/mount/mount.go -index 8074dbe6..b8cdc5cb 100644 +index ecf7ce7f..395e772a 100644 --- a/internal/exec/stages/mount/mount.go +++ b/internal/exec/stages/mount/mount.go @@ -118,6 +118,11 @@ func (s stage) mountFs(fs types.Filesystem) error { @@ -28,5 +28,5 @@ index 8074dbe6..b8cdc5cb 100644 if err := checkForNonDirectories(path); err != nil { return err -- -2.25.1 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-usr-share-oem-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-usr-share-oem-oem.patch deleted file mode 100644 index b594f78ab8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-usr-share-oem-oem.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 6f80f077330d91ee9bab5ece26dceb5b4a12939a Mon Sep 17 00:00:00 2001 -From: Krzesimir Nowak -Date: Tue, 4 Apr 2023 12:12:42 +0200 -Subject: [PATCH 20/21] /usr/share/oem -> /oem - ---- - config/util/translate.go | 2 +- - docs/supported-platforms.md | 2 +- - internal/distro/distro.go | 5 ++++- - 3 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/config/util/translate.go b/config/util/translate.go -index 347d148c..d4c057b2 100644 ---- a/config/util/translate.go -+++ b/config/util/translate.go -@@ -154,7 +154,7 @@ func FSGeneration(name string, fsMap map[string]string) (string, error) { - if _, ok := fsMap[name]; !ok { - addedSuffixCounter += 1 - if name == "oem" { -- fsMap[name] = "/usr/share/oem" -+ fsMap[name] = "/oem" - } else { - // generate a new path - fsMap[name] = "/tmp/" + name + "-ign" + strconv.FormatUint(addedSuffixCounter, 10) -diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md -index eb5db00f..d79c3bf2 100644 ---- a/docs/supported-platforms.md -+++ b/docs/supported-platforms.md -@@ -10,7 +10,7 @@ Ignition is currently only supported for the following platforms: - * [Amazon Web Services] (`aws`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately. - * [Microsoft Azure] (`azure`)- Ignition will read its configuration from the custom data provided to the instance. Cloud SSH keys are handled separately. - * [Microsoft Azure Stack] (`azurestack`) - Ignition will read its configuration from the custom data provided to the instance. Cloud SSH keys are handled separately. --* Bare Metal - Use the `ignition.config.url` kernel parameter to provide a URL to the configuration. The URL can use the `http://`, `https://`, `tftp://`, `s3://`, or `gs://` schemes to specify a remote config or the `oem://` scheme to specify a local config, rooted in `/usr/share/oem`. -+* Bare Metal - Use the `ignition.config.url` kernel parameter to provide a URL to the configuration. The URL can use the `http://`, `https://`, `tftp://`, `s3://`, or `gs://` schemes to specify a remote config or the `oem://` scheme to specify a local config, rooted in `/oem`. - * [Brightbox] (`brightbox`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately. - * `cloudsigma` - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately. - * [CloudStack] (`cloudstack`) - Ignition will read its configuration from the instance userdata via either metadata service or config drive. Cloud SSH keys are handled separately. -diff --git a/internal/distro/distro.go b/internal/distro/distro.go -index 644c42c4..9e96166e 100644 ---- a/internal/distro/distro.go -+++ b/internal/distro/distro.go -@@ -32,7 +32,10 @@ var ( - bootIDPath = "/proc/sys/kernel/random/boot_id" - // initramfs directory containing distro-provided base config - systemConfigDir = "/usr/lib/ignition" -- // initramfs directory to check before retrieving file from OEM partition -+ // initramfs directory to check before retrieving file from -+ // OEM partition; note that OEM partition is mounted on /oem -+ // on the host, but initrds still use /usr/share/oem for -+ // backwards compatilibity - oemLookasideDir = "/usr/share/oem" - - // Helper programs --- -2.25.1 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0022-sgdisk-Run-partprobe-after-partition-changes.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-sgdisk-Run-partprobe-after-partition-changes.patch similarity index 87% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0022-sgdisk-Run-partprobe-after-partition-changes.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-sgdisk-Run-partprobe-after-partition-changes.patch index 06901f2a20..fdbb58a25b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0022-sgdisk-Run-partprobe-after-partition-changes.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-sgdisk-Run-partprobe-after-partition-changes.patch @@ -1,7 +1,7 @@ -From e5c4e6bd9f3bad3b27e338e4da2f3b0b53ab1599 Mon Sep 17 00:00:00 2001 +From 7c3cfae0c00508c845c8408d5a8ec00bc32316a8 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Fri, 29 Sep 2023 18:06:09 +0200 -Subject: [PATCH] sgdisk: Run partprobe after partition changes +Subject: [PATCH 21/21] sgdisk: Run partprobe after partition changes The sgdisk tool does not update the kernel partition table in contrast to other similar tools. Often udev can detect the changes but not always @@ -15,7 +15,7 @@ kernel partition table, trigger the re-read with partprobe. 3 files changed, 8 insertions(+) diff --git a/dracut/30ignition/module-setup.sh b/dracut/30ignition/module-setup.sh -index ad7e80fd..3cdcb631 100755 +index 816e4b66..e59f8cdf 100755 --- a/dracut/30ignition/module-setup.sh +++ b/dracut/30ignition/module-setup.sh @@ -33,6 +33,7 @@ install() { @@ -27,10 +27,10 @@ index ad7e80fd..3cdcb631 100755 userdel \ usermod \ diff --git a/internal/distro/distro.go b/internal/distro/distro.go -index 61ca87ae..c1c13b62 100644 +index 9e96166e..04544dbf 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go -@@ -37,6 +37,7 @@ var ( +@@ -44,6 +44,7 @@ var ( mdadmCmd = "mdadm" mountCmd = "mount" sgdiskCmd = "sgdisk" @@ -38,7 +38,7 @@ index 61ca87ae..c1c13b62 100644 modprobeCmd = "modprobe" udevadmCmd = "udevadm" usermodCmd = "usermod" -@@ -90,6 +91,7 @@ func GroupdelCmd() string { return groupdelCmd } +@@ -100,6 +101,7 @@ func GroupdelCmd() string { return groupdelCmd } func MdadmCmd() string { return mdadmCmd } func MountCmd() string { return mountCmd } func SgdiskCmd() string { return sgdiskCmd } @@ -47,7 +47,7 @@ index 61ca87ae..c1c13b62 100644 func UdevadmCmd() string { return udevadmCmd } func UsermodCmd() string { return usermodCmd } diff --git a/internal/sgdisk/sgdisk.go b/internal/sgdisk/sgdisk.go -index 29915809..e70a3881 100644 +index 136aca67..5f9d399a 100644 --- a/internal/sgdisk/sgdisk.go +++ b/internal/sgdisk/sgdisk.go @@ -121,6 +121,11 @@ func (op *Operation) Commit() error { @@ -63,5 +63,5 @@ index 29915809..e70a3881 100644 return nil } -- -2.41.0 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.15.0-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.17.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.15.0-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.17.0.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild index 6c53d9c7ec..7ae965542e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild @@ -12,7 +12,7 @@ inherit coreos-go cros-workon systemd udev if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="13f05b3c9f6221fb68234387ff2e4c2d63a39b63" # v2.15.0 + CROS_WORKON_COMMIT="45e9d394a3e4f240e9d6745af0a83fa36179f510" # v2.17.0 KEYWORDS="amd64 arm64" fi @@ -43,10 +43,10 @@ RDEPEND+="${DEPEND}" PATCHES=( "${FILESDIR}/0001-sed-s-coreos-flatcar.patch" - "${FILESDIR}/0002-mod-add-flatcar-ignition-0.36.2.patch" - "${FILESDIR}/0003-sum-go-mod-tidy.patch" - "${FILESDIR}/0004-vendor-go-mod-vendor.patch" - "${FILESDIR}/0005-config-add-ignition-translation.patch" + "${FILESDIR}/0002-config-add-ignition-translation.patch" + "${FILESDIR}/0003-mod-add-flatcar-ignition-0.36.2.patch" + "${FILESDIR}/0004-sum-go-mod-tidy.patch" + "${FILESDIR}/0005-vendor-go-mod-vendor.patch" "${FILESDIR}/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch" "${FILESDIR}/0007-internal-prv-cmdline-backport-flatcar-patch.patch" "${FILESDIR}/0008-provider-qemu-apply-fw_cfg-patch.patch" @@ -57,13 +57,12 @@ PATCHES=( "${FILESDIR}/0013-config-util-add-cloud-init-detection-to-initial-pars.patch" "${FILESDIR}/0014-Revert-drop-OEM-URI-support.patch" "${FILESDIR}/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch" - "${FILESDIR}/0016-internal-exec-stages-disks-prevent-races-with-udev.patch" - "${FILESDIR}/0017-translation-support-OEM-and-oem.patch" - "${FILESDIR}/0018-revert-internal-oem-drop-noop-OEMs.patch" - "${FILESDIR}/0019-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch" - "${FILESDIR}/0020-usr-share-oem-oem.patch" - "${FILESDIR}/0021-internal-exec-stages-mount-Mount-oem.patch" - "${FILESDIR}/0022-sgdisk-Run-partprobe-after-partition-changes.patch" + "${FILESDIR}/0016-translation-support-OEM-and-oem.patch" + "${FILESDIR}/0017-revert-internal-oem-drop-noop-OEMs.patch" + "${FILESDIR}/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch" + "${FILESDIR}/0019-usr-share-oem-oem.patch" + "${FILESDIR}/0020-internal-exec-stages-mount-Mount-oem.patch" + "${FILESDIR}/0021-sgdisk-Run-partprobe-after-partition-changes.patch" ) src_compile() { From 2c2b20dd7de9fb21855dced426e07f2a51f455b8 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 20 Feb 2024 10:41:32 +0100 Subject: [PATCH 2/2] changelog: add entry Signed-off-by: Mathieu Tortuyaux --- changelog/updates/2024-02-20-ignition.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/updates/2024-02-20-ignition.md diff --git a/changelog/updates/2024-02-20-ignition.md b/changelog/updates/2024-02-20-ignition.md new file mode 100644 index 0000000000..ffe0446f4b --- /dev/null +++ b/changelog/updates/2024-02-20-ignition.md @@ -0,0 +1 @@ +- Ignition ([2.17.0](https://coreos.github.io/ignition/release-notes/#ignition-2170-2023-11-20) (includes [2.16.2](https://coreos.github.io/ignition/release-notes/#ignition-2162-2023-07-12), [2.16.1](https://coreos.github.io/ignition/release-notes/#ignition-2161-2023-07-10) and [2.16.0](https://coreos.github.io/ignition/release-notes/#ignition-2160-2023-06-29)))