diff --git a/changelog/updates/2024-06-07-ignition.md b/changelog/updates/2024-06-07-ignition.md new file mode 100644 index 00000000000..be6e3847bfb --- /dev/null +++ b/changelog/updates/2024-06-07-ignition.md @@ -0,0 +1 @@ +- Ignition ([2.19.0](https://coreos.github.io/ignition/release-notes/#ignition-2190-2024-06-05)) 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 11609544e06..8a4a8b09708 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,21 +1,15 @@ -From 437c0f5da61e4195bcfc03da1de9b391cb76472c Mon Sep 17 00:00:00 2001 +From 6cd70e07fca9cb3d436a084110d11636f6b745eb Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Mon, 4 Mar 2024 14:53:49 +0100 +Date: Fri, 7 Jun 2024 09:08:51 +0200 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 | 2 +- build_blackbox_tests | 10 ++-- build_for_container | 2 +- config/config.go | 4 +- - config/config_test.go | 14 +++--- + config/config_test.go | 14 ++--- config/doc/generate.go | 2 +- config/doc/schema.go | 2 +- config/merge/merge.go | 6 +-- @@ -55,7 +49,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_0/types/url_test.go | 4 +- config/v3_0/types/verification.go | 2 +- config/v3_0/types/verification_test.go | 2 +- - config/v3_1/config.go | 14 +++--- + 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_test.go | 4 +- @@ -92,7 +86,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_1/types/url_test.go | 4 +- config/v3_1/types/verification.go | 2 +- config/v3_1/types/verification_test.go | 2 +- - config/v3_2/config.go | 14 +++--- + config/v3_2/config.go | 14 ++--- config/v3_2/config_test.go | 4 +- config/v3_2/translate/translate.go | 6 +-- config/v3_2/translate/translate_test.go | 4 +- @@ -132,7 +126,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_2/types/url_test.go | 4 +- config/v3_2/types/verification.go | 2 +- config/v3_2/types/verification_test.go | 2 +- - config/v3_3/config.go | 14 +++--- + 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_test.go | 4 +- @@ -174,7 +168,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_3/types/url_test.go | 4 +- config/v3_3/types/verification.go | 2 +- config/v3_3/types/verification_test.go | 2 +- - config/v3_4/config.go | 14 +++--- + 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_test.go | 4 +- @@ -217,10 +211,12 @@ Signed-off-by: Mathieu Tortuyaux config/v3_4/types/url_test.go | 4 +- config/v3_4/types/verification.go | 2 +- config/v3_4/types/verification_test.go | 2 +- - config/v3_5_experimental/config.go | 14 +++--- + config/v3_5_experimental/config.go | 14 ++--- config/v3_5_experimental/config_test.go | 4 +- .../v3_5_experimental/translate/translate.go | 6 +-- .../translate/translate_test.go | 4 +- + config/v3_5_experimental/types/cex.go | 2 +- + config/v3_5_experimental/types/cex_test.go | 2 +- config/v3_5_experimental/types/clevis.go | 4 +- config/v3_5_experimental/types/clevis_test.go | 4 +- config/v3_5_experimental/types/config.go | 4 +- @@ -277,7 +273,7 @@ Signed-off-by: Mathieu Tortuyaux go.mod | 2 +- internal/apply/apply.go | 30 +++++------ internal/distro/distro.go | 2 +- - internal/doc/main.go | 14 +++--- + internal/doc/main.go | 14 ++--- internal/exec/config_fetcher.go | 18 +++---- internal/exec/engine.go | 22 ++++---- internal/exec/stages/disks/disks.go | 16 +++--- @@ -288,16 +284,16 @@ Signed-off-by: Mathieu Tortuyaux internal/exec/stages/fetch/fetch.go | 12 ++--- .../stages/fetch_offline/fetch-offline.go | 16 +++--- .../fetch_offline/fetch_offline_test.go | 4 +- - internal/exec/stages/files/files.go | 14 +++--- + internal/exec/stages/files/files.go | 14 ++--- internal/exec/stages/files/files_test.go | 4 +- .../exec/stages/files/filesystemEntries.go | 12 ++--- internal/exec/stages/files/passwd.go | 4 +- internal/exec/stages/files/units.go | 12 ++--- internal/exec/stages/files/units_test.go | 4 +- - internal/exec/stages/kargs/kargs.go | 14 +++--- + internal/exec/stages/kargs/kargs.go | 14 ++--- internal/exec/stages/mount/mount.go | 16 +++--- internal/exec/stages/stages.go | 10 ++-- - internal/exec/stages/umount/umount.go | 14 +++--- + 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 +-- @@ -307,6 +303,7 @@ Signed-off-by: Mathieu Tortuyaux internal/exec/util/util.go | 6 +-- internal/main.go | 18 +++---- internal/platform/platform.go | 10 ++-- + internal/providers/akamai/akamai.go | 8 +-- internal/providers/aliyun/aliyun.go | 8 +-- internal/providers/applehv/applehv.go | 10 ++-- internal/providers/aws/aws.go | 12 ++--- @@ -320,26 +317,26 @@ Signed-off-by: Mathieu Tortuyaux 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/ibmcloud/ibmcloud.go | 14 ++--- + internal/providers/kubevirt/kubevirt.go | 14 ++--- internal/providers/metal/metal.go | 8 +-- - internal/providers/nutanix/nutanix.go | 14 +++--- + 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/powervs/powervs.go | 14 ++--- internal/providers/qemu/qemu_blockdev.go | 12 ++--- internal/providers/qemu/qemu_fwcfg.go | 10 ++-- internal/providers/scaleway/scaleway.go | 8 +-- - internal/providers/system/system.go | 14 +++--- + internal/providers/system/system.go | 14 ++--- internal/providers/util/config.go | 6 +-- 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 | 50 +++++++++---------- - internal/register/stages.go | 14 +++--- + internal/providers/zvm/zvm.go | 14 ++--- + internal/register/providers.go | 52 +++++++++---------- + internal/register/stages.go | 14 ++--- internal/resource/http.go | 12 ++--- internal/resource/url.go | 6 +-- internal/resource/url_test.go | 6 +-- @@ -393,137 +390,17 @@ Signed-off-by: Mathieu Tortuyaux tests/positive/systemd/create_unit.go | 4 +- tests/positive/systemd/modify_service.go | 4 +- tests/positive/timeouts/timeouts.go | 4 +- - tests/register/register.go | 14 +++--- + tests/register/register.go | 14 ++--- tests/registry/registry.go | 36 ++++++------- tests/servers/servers.go | 2 +- tests/validator.go | 4 +- validate/main.go | 4 +- - 393 files changed, 1057 insertions(+), 1057 deletions(-) + 390 files changed, 1050 insertions(+), 1050 deletions(-) -diff --git a/.github/ISSUE_TEMPLATE/release-checklist.md b/.github/ISSUE_TEMPLATE/release-checklist.md -index 2f542cbb..7277a70f 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 +index dba50388..661f0eba 100755 --- a/build +++ b/build -@@ -5,7 +5,7 @@ set -eu - export GO111MODULE=on - - NAME="ignition" --ORG_PATH="github.com/coreos" -+ORG_PATH="github.com/flatcar" - REPO_PATH="${ORG_PATH}/${NAME}/v2" - GLDFLAGS=${GLDFLAGS:-} - export GOFLAGS=-mod=vendor @@ -15,7 +15,7 @@ if [ -z ${VERSION+a} ]; then echo "Using version from git: $VERSION" fi @@ -3682,7 +3559,7 @@ index a56b4b3a..7e10866e 100644 ) diff --git a/config/v3_5_experimental/translate/translate.go b/config/v3_5_experimental/translate/translate.go -index 5647e629..fd801170 100644 +index 19f6da5d..dbaac4c3 100644 --- a/config/v3_5_experimental/translate/translate.go +++ b/config/v3_5_experimental/translate/translate.go @@ -15,9 +15,9 @@ @@ -3713,6 +3590,32 @@ index 7896facc..c6afaa31 100644 ) // Check that we have valid translators for the complete config struct +diff --git a/config/v3_5_experimental/types/cex.go b/config/v3_5_experimental/types/cex.go +index b34f5f52..6f58b373 100644 +--- a/config/v3_5_experimental/types/cex.go ++++ b/config/v3_5_experimental/types/cex.go +@@ -15,7 +15,7 @@ + package types + + import ( +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" +diff --git a/config/v3_5_experimental/types/cex_test.go b/config/v3_5_experimental/types/cex_test.go +index 35d562d8..e856a93f 100644 +--- a/config/v3_5_experimental/types/cex_test.go ++++ b/config/v3_5_experimental/types/cex_test.go +@@ -18,7 +18,7 @@ import ( + "reflect" + "testing" + +- "github.com/coreos/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/util" + + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" diff --git a/config/v3_5_experimental/types/clevis.go b/config/v3_5_experimental/types/clevis.go index 68887d43..564154f6 100644 --- a/config/v3_5_experimental/types/clevis.go @@ -3901,7 +3804,7 @@ index 1a258727..a79c037a 100644 func TestKernelArgumentsValidate(t *testing.T) { diff --git a/config/v3_5_experimental/types/luks.go b/config/v3_5_experimental/types/luks.go -index 90d72387..2862ebae 100644 +index e4c1d681..ce9d087f 100644 --- a/config/v3_5_experimental/types/luks.go +++ b/config/v3_5_experimental/types/luks.go @@ -17,8 +17,8 @@ package types @@ -4315,7 +4218,7 @@ 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 e685a39f..d08e93ff 100644 +index 2e918bd0..6f51601a 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -23,7 +23,7 @@ color_scheme: coreos @@ -4527,7 +4430,7 @@ index 95ae838f..4c734e43 100644 Before=initrd.target diff --git a/dracut/30ignition/module-setup.sh b/dracut/30ignition/module-setup.sh -index 51bec7e7..340452b9 100755 +index e1d3e480..3ac9c11c 100755 --- a/dracut/30ignition/module-setup.sh +++ b/dracut/30ignition/module-setup.sh @@ -59,7 +59,7 @@ install() { @@ -4536,11 +4439,11 @@ index 51bec7e7..340452b9 100755 # 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 + if [[ ${DRACUT_ARCH:-$(uname -m)} == s390x ]]; then + inst_multiple chccwdev vmur zkey zkey-cryptsetup - # Required on system using SELinux diff --git a/go.mod b/go.mod -index f749e0d5..c24348db 100644 +index 1abba79c..42f7800d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ @@ -4591,7 +4494,7 @@ index 33113c5c..e8675889 100644 type Flags struct { diff --git a/internal/distro/distro.go b/internal/distro/distro.go -index 61ca87ae..703385ea 100644 +index 4879f805..35c65721 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go @@ -20,7 +20,7 @@ import ( @@ -4737,11 +4640,11 @@ index d33c1153..62dab634 100644 var ( diff --git a/internal/exec/stages/disks/luks.go b/internal/exec/stages/disks/luks.go -index 5117234e..5783b95a 100644 +index 9a1943fb..661f7f43 100644 --- a/internal/exec/stages/disks/luks.go +++ b/internal/exec/stages/disks/luks.go -@@ -26,12 +26,12 @@ import ( - "path" +@@ -29,12 +29,12 @@ import ( + "strconv" "strings" - "github.com/coreos/ignition/v2/config/util" @@ -4861,7 +4764,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 5ab5242a..c7785c26 100644 +index ba6b9bf6..cb3601d8 100644 --- a/internal/exec/stages/files/files.go +++ b/internal/exec/stages/files/files.go @@ -20,13 +20,13 @@ import ( @@ -4901,7 +4804,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 4df1f00c..1ca48c9a 100644 +index a6e0588f..e2ca484e 100644 --- a/internal/exec/stages/files/filesystemEntries.go +++ b/internal/exec/stages/files/filesystemEntries.go @@ -24,11 +24,11 @@ import ( @@ -5183,7 +5086,7 @@ index 2482d710..8893157a 100644 // tempBase() slaps together a minimal /etc/{passwd,group} for the lookup test. diff --git a/internal/exec/util/util.go b/internal/exec/util/util.go -index 4a81f776..bd73adf4 100644 +index 7e880e3b..f1865474 100644 --- a/internal/exec/util/util.go +++ b/internal/exec/util/util.go @@ -18,9 +18,9 @@ import ( @@ -5247,6 +5150,25 @@ index 48d60615..ff31a267 100644 + "github.com/flatcar/ignition/v2/internal/resource" + "github.com/flatcar/ignition/v2/internal/state" + "github.com/coreos/vcontext/report" + ) +diff --git a/internal/providers/akamai/akamai.go b/internal/providers/akamai/akamai.go +index c7debf3b..ffc1e5a0 100644 +--- a/internal/providers/akamai/akamai.go ++++ b/internal/providers/akamai/akamai.go +@@ -24,10 +24,10 @@ import ( + "net/http" + "net/url" + +- "github.com/coreos/ignition/v2/config/v3_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/aliyun/aliyun.go b/internal/providers/aliyun/aliyun.go @@ -5941,13 +5863,14 @@ index 84f66ec3..d07f1ffc 100644 ) diff --git a/internal/register/providers.go b/internal/register/providers.go -index e7a06b38..372ee32d 100644 +index 5382e2f3..eaf3fb18 100644 --- a/internal/register/providers.go +++ b/internal/register/providers.go -@@ -15,29 +15,29 @@ +@@ -15,30 +15,30 @@ package register import ( +- _ "github.com/coreos/ignition/v2/internal/providers/akamai" - _ "github.com/coreos/ignition/v2/internal/providers/aliyun" - _ "github.com/coreos/ignition/v2/internal/providers/applehv" - _ "github.com/coreos/ignition/v2/internal/providers/aws" @@ -5973,6 +5896,7 @@ index e7a06b38..372ee32d 100644 - _ "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/akamai" + _ "github.com/flatcar/ignition/v2/internal/providers/aliyun" + _ "github.com/flatcar/ignition/v2/internal/providers/applehv" + _ "github.com/flatcar/ignition/v2/internal/providers/aws" @@ -6099,7 +6023,7 @@ index 29915809..136aca67 100644 type Operation struct { diff --git a/internal/state/state.go b/internal/state/state.go -index 0adff2e8..4d4c42e1 100644 +index 462cc4d2..8b57aa36 100644 --- a/internal/state/state.go +++ b/internal/state/state.go @@ -20,7 +20,7 @@ import ( @@ -6972,5 +6896,5 @@ index bec64866..ed027604 100644 var ( -- -2.43.0 +2.43.2 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch index ae9d776b3e1..e74b01e1151 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch @@ -1,4 +1,4 @@ -From 716283d11f3ca67e5f1a17970fb7660fb05641ab Mon Sep 17 00:00:00 2001 +From 344f72895161d411b733a245f5d3e249ef3466fe Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 26 Sep 2022 12:12:04 +0200 Subject: [PATCH 02/21] config: add ignition translation @@ -7,14 +7,28 @@ it's a merge from flatcar/ign-converter Signed-off-by: Mathieu Tortuyaux --- + build | 2 +- config/util/translate.go | 166 +++ config/v24tov31/v24tov31.go | 729 +++++++++++++ config/v24tov31/v24tov31_test.go | 1692 ++++++++++++++++++++++++++++++ - 3 files changed, 2587 insertions(+) + 4 files changed, 2588 insertions(+), 1 deletion(-) create mode 100644 config/util/translate.go create mode 100644 config/v24tov31/v24tov31.go create mode 100644 config/v24tov31/v24tov31_test.go +diff --git a/build b/build +index 661f0eba..b8f0a049 100755 +--- a/build ++++ b/build +@@ -5,7 +5,7 @@ set -eu + export GO111MODULE=on + + NAME="ignition" +-ORG_PATH="github.com/coreos" ++ORG_PATH="github.com/flatcar" + REPO_PATH="${ORG_PATH}/${NAME}/v2" + GLDFLAGS=${GLDFLAGS:-} + export GOFLAGS=-mod=vendor diff --git a/config/util/translate.go b/config/util/translate.go new file mode 100644 index 00000000..347d148c @@ -2621,5 +2635,5 @@ index 00000000..e81f6bed + } +} -- -2.43.0 +2.43.2 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch index c22cca88722..71887b51b8c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch @@ -1,6 +1,6 @@ -From 37cff851d08cd24c8590ef4072436aa5184b9a36 Mon Sep 17 00:00:00 2001 +From a0b0b93a5794d15ac1dcf9cf504bc3b3bafd03ba Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Mon, 4 Mar 2024 14:55:33 +0100 +Date: Fri, 7 Jun 2024 09:09:18 +0200 Subject: [PATCH 03/21] mod: add flatcar/ignition@0.36.2 it's required for Ignition conversion. @@ -11,7 +11,7 @@ Signed-off-by: Mathieu Tortuyaux 1 file changed, 4 insertions(+) diff --git a/go.mod b/go.mod -index c24348db..5f74f954 100644 +index 42f7800d..5eb792c3 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ require ( @@ -22,24 +22,24 @@ index c24348db..5f74f954 100644 github.com/google/renameio/v2 v2.0.0 github.com/google/uuid v1.6.0 github.com/mdlayher/vsock v1.2.1 -@@ -31,7 +32,9 @@ require ( - cloud.google.com/go v0.112.0 // indirect - cloud.google.com/go/compute v1.23.4 // indirect - cloud.google.com/go/iam v1.1.6 // indirect +@@ -32,7 +33,9 @@ require ( + cloud.google.com/go/auth v0.4.1 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect + cloud.google.com/go/iam v1.1.8 // 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/felixge/httpsnoop v1.0.4 // indirect github.com/go-logr/logr v1.4.1 // indirect -@@ -52,6 +55,7 @@ require ( - go.opentelemetry.io/otel v1.23.0 // indirect - go.opentelemetry.io/otel/metric v1.23.0 // indirect - go.opentelemetry.io/otel/trace v1.23.0 // indirect +@@ -53,6 +56,7 @@ require ( + go.opentelemetry.io/otel v1.24.0 // indirect + go.opentelemetry.io/otel/metric v1.24.0 // indirect + go.opentelemetry.io/otel/trace v1.24.0 // indirect + go4.org v0.0.0-20160314031811-03efcb870d84 // indirect - golang.org/x/crypto v0.19.0 // indirect - golang.org/x/sync v0.6.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/crypto v0.23.0 // indirect + golang.org/x/sync v0.7.0 // indirect + golang.org/x/text v0.15.0 // indirect -- -2.43.0 +2.43.2 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch index a1533992883..24d340b7aba 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch @@ -1,29 +1,29 @@ -From c7206a8d87a56aac24d4cb7306fc63a239dbca19 Mon Sep 17 00:00:00 2001 +From 07123c1685d70b571a599eb5869acccf7f95f69f Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Mon, 4 Mar 2024 14:55:43 +0100 +Date: Fri, 7 Jun 2024 09:09:50 +0200 Subject: [PATCH 04/21] sum: go mod tidy Signed-off-by: Mathieu Tortuyaux --- - go.sum | 28 +++++++++++++++++++++++++++- - 1 file changed, 27 insertions(+), 1 deletion(-) + go.sum | 29 ++++++++++++++++++++++++++++- + 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/go.sum b/go.sum -index dac484dc..4afcd5be 100644 +index f92fb462..74444e57 100644 --- a/go.sum +++ b/go.sum -@@ -10,6 +10,9 @@ cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWO - cloud.google.com/go/storage v1.38.0 h1:Az68ZRGlnNTpIBbLjSMIV2BDcwwXYlRlQzis0llkpJg= - cloud.google.com/go/storage v1.38.0/go.mod h1:tlUADB0mAb9BgYls9lq+8MGkfzOXuLrnHXlpHmvFJoY= +@@ -12,6 +12,9 @@ cloud.google.com/go/iam v1.1.8/go.mod h1:GvE6lyMmfxXauzNq8NbgJbeVQNspG+tcdL/W8QO + cloud.google.com/go/storage v1.41.0 h1:RusiwatSu6lHeEXe3kglxakAmAbfV+rhtPqA6i8RBx0= + cloud.google.com/go/storage v1.41.0/go.mod h1:J1WCa/Z2FcgdEDuPUY8DxT5I+d9mFKsCepp5vR6Sq80= 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.50.25 h1:vhiHtLYybv1Nhx3Kv18BBC6L0aPJHaG9aeEsr92W99c= - github.com/aws/aws-sdk-go v1.50.25/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= - github.com/beevik/etree v1.3.0 h1:hQTc+pylzIKDb23yYprodCWWTt+ojFfUZyzU09a/hmU= -@@ -22,8 +25,11 @@ github.com/containers/libhvee v0.6.0 h1:tUzwSz8R0GjR6IctgDnkTMjdtCk5Mxhpai4Vyv6U - github.com/containers/libhvee v0.6.0/go.mod h1:f/q1wCdQqOLiK3IZqqBfOD7exMZYBU5pDYsrMa/pSFg= + github.com/aws/aws-sdk-go v1.53.5 h1:1OcVWMjGlwt7EU5OWmmEEXqaYfmX581EK317QJZXItM= + github.com/aws/aws-sdk-go v1.53.5/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= + github.com/beevik/etree v1.4.0 h1:oz1UedHRepuY3p4N5OjE0nK1WLCqtzHf25bxplKOHLs= +@@ -23,8 +26,11 @@ github.com/containers/libhvee v0.7.1 h1:dWGF5GLq9DZvXo3P8aDp3cNieL5eCaSell4UmeA/ + github.com/containers/libhvee v0.7.1/go.mod h1:fRKB3AyIqHMvq6xaeYhTpckM2cdoq0oecolyoiuLP7M= 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= @@ -34,8 +34,8 @@ index dac484dc..4afcd5be 100644 github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 h1:uSmlDgJGbUB0bwQBcZomBTottKwEDF5fF8UjSwKSzWM= -@@ -38,11 +44,15 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 - github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= +@@ -38,11 +44,15 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m + github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/flatcar/ignition v0.36.2 h1:xGHgScUe0P4Fkprjqv7L2CE58emiQgP833OCCn9z2v4= @@ -50,10 +50,10 @@ index dac484dc..4afcd5be 100644 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= -@@ -83,10 +93,13 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfF +@@ -80,10 +90,13 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfF github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= - github.com/googleapis/gax-go/v2 v2.12.1 h1:9F8GV9r9ztXyAi00gsMQHNoF51xPZm8uj1dpYt2ZETM= - github.com/googleapis/gax-go/v2 v2.12.1/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= + github.com/googleapis/gax-go/v2 v2.12.4 h1:9gWcmF85Wvq4ryPFvGFaOgPIs1AQX0d0bcbGw4Z96qg= + github.com/googleapis/gax-go/v2 v2.12.4/go.mod h1:KYEYLorsnIGDi/rPC8b5TdlB9kbKoFubselGIoBMCwI= +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= @@ -64,7 +64,7 @@ index dac484dc..4afcd5be 100644 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= -@@ -95,16 +108,22 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1 +@@ -92,16 +105,22 @@ 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= @@ -87,44 +87,52 @@ index dac484dc..4afcd5be 100644 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= -@@ -112,8 +131,10 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU - github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +@@ -109,8 +128,10 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT + github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8AbShPRpg2CI= github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U= +github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod h1:x9oS4Wk2s2u4tS29nEaDLdzvuHdB19CvSGJjPgkZJNk= github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3 h1:v6jG/tdl4O07LNVp74Nt7/OyL+1JsIW1M2f/nSvQheY= github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3/go.mod h1:CSBTxrhePCm0cmXNKDGeu+6bOQzpaEklfCqEpn89JWk= +github.com/vmware/vmw-ovflib v0.0.0-20170608004843-1f217b9dc714/go.mod h1:jiPk45kn7klhByRvUq5i2vo1RtHKBHj+iWGFpxbXuuI= - github.com/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= -@@ -128,6 +149,8 @@ go.opentelemetry.io/otel/metric v1.23.0/go.mod h1:MqUW2X2a6Q8RN96E2/nqNoT+z9BSms - go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= - go.opentelemetry.io/otel/trace v1.23.0 h1:37Ik5Ib7xfYVb4V1UtnT97T1jI+AoIYkJyPkuL4iJgI= - go.opentelemetry.io/otel/trace v1.23.0/go.mod h1:GSGTbIClEsuZrGIzoEHqsVfxgn5UkggkflQwDScNUsk= + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +@@ -124,6 +145,8 @@ go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8p + go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw= + go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= + go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= +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= -@@ -142,6 +165,7 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r + golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= +@@ -136,6 +159,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-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -@@ -182,6 +206,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm + golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +@@ -156,6 +180,7 @@ golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= + golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= ++golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= + golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= + golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= + golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +@@ -164,6 +189,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= -@@ -225,8 +250,9 @@ google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7 - google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= + golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= + golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= +@@ -200,8 +226,9 @@ google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFW + google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= 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= @@ -135,5 +143,5 @@ index dac484dc..4afcd5be 100644 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -- -2.43.0 +2.43.2 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch index 1430194181c..2cdd9233aa6 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch @@ -1,6 +1,6 @@ -From 59381307c3483608d300401208ad6f88d68c1cc6 Mon Sep 17 00:00:00 2001 +From 61fedb620afb81ec657419e0835439c03cc14c04 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Mon, 4 Mar 2024 14:56:54 +0100 +Date: Fri, 7 Jun 2024 09:10:35 +0200 Subject: [PATCH 05/21] vendor: go mod vendor Signed-off-by: Mathieu Tortuyaux @@ -17029,20 +17029,20 @@ index 00000000..1b1efb0f + return +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index 8ce5cb4d..a4d3a6dd 100644 +index 765c8cb6..d1184cea 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt -@@ -20,6 +20,9 @@ cloud.google.com/go/storage +@@ -36,6 +36,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/storagepb +# github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 +## explicit +github.com/ajeddeloh/go-json - # github.com/aws/aws-sdk-go v1.50.25 + # github.com/aws/aws-sdk-go v1.53.5 ## explicit; go 1.19 github.com/aws/aws-sdk-go/aws -@@ -87,6 +90,9 @@ github.com/coreos/go-json +@@ -103,6 +106,9 @@ github.com/coreos/go-json # github.com/coreos/go-semver v0.3.1 ## explicit; go 1.8 github.com/coreos/go-semver/semver @@ -17052,7 +17052,7 @@ index 8ce5cb4d..a4d3a6dd 100644 # github.com/coreos/go-systemd/v22 v22.5.0 ## explicit; go 1.12 github.com/coreos/go-systemd/v22/dbus -@@ -105,6 +111,27 @@ github.com/davecgh/go-spew/spew +@@ -121,6 +127,27 @@ github.com/davecgh/go-spew/spew # github.com/felixge/httpsnoop v1.0.4 ## explicit; go 1.13 github.com/felixge/httpsnoop @@ -17080,16 +17080,16 @@ index 8ce5cb4d..a4d3a6dd 100644 # github.com/go-logr/logr v1.4.1 ## explicit; go 1.18 github.com/go-logr/logr -@@ -253,6 +280,9 @@ go.opentelemetry.io/otel/metric/noop +@@ -264,6 +291,9 @@ go.opentelemetry.io/otel/metric/noop ## explicit; go 1.20 go.opentelemetry.io/otel/trace go.opentelemetry.io/otel/trace/embedded +# go4.org v0.0.0-20160314031811-03efcb870d84 +## explicit +go4.org/errorutil - # golang.org/x/crypto v0.19.0 + # golang.org/x/crypto v0.23.0 ## explicit; go 1.18 golang.org/x/crypto/chacha20 -- -2.43.0 +2.43.2 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 9c246b91ca1..56ef86a30f7 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 4aebd9b560eb32fb6961846112985efc2ebfa867 Mon Sep 17 00:00:00 2001 +From 7ad89a545ac31d4308d94c11e5c808e04fd10ce1 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.43.0 +2.43.2 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 4150f24f6a5..d0234c4ca37 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch @@ -1,4 +1,4 @@ -From 9d97af5dd7cb5f6f301e970cdc24126d8a764c19 Mon Sep 17 00:00:00 2001 +From 618ac3e4556fc03eae599b736eff2086d9a95722 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 @@ -36,5 +36,5 @@ index eb8e2b45..0561438a 100644 } -- -2.43.0 +2.43.2 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 5c31cb87e30..243613db3b3 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch @@ -1,4 +1,4 @@ -From 77f3bc5ddd558f75c3239ebf35ee6f430bcda016 Mon Sep 17 00:00:00 2001 +From 3e06976d9deb99b7979638505541d2166d00f8d9 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 20 Feb 2024 10:02:28 +0100 Subject: [PATCH 08/21] provider/qemu: apply fw_cfg patch @@ -159,5 +159,5 @@ index a150869f..e233865a 100644 + } -- -2.43.0 +2.43.2 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 e5d3570e5bb..83c70b794b0 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 a5c1c025a4eaa12b22eb3093afe0a90350d3e097 Mon Sep 17 00:00:00 2001 +From cf6306e8abb2af8294c9c8f4853480fbb01623b6 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.43.0 +2.43.2 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 871dcac6647..42506151717 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 c50b4a4645da737d570ed4f4c971004e9529f76e Mon Sep 17 00:00:00 2001 +From 5a3d73b56b1cda394534bedfb12b88893c80b60c 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 @@ -35,5 +35,5 @@ index 62dab634..2bd2debd 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.43.0 +2.43.2 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 54814e9e930..2982ea9d28e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch @@ -1,4 +1,4 @@ -From 7a1c08f0e2098687ce5756808872cf212408fdd3 Mon Sep 17 00:00:00 2001 +From c805eca7a8627020e0c73c304aba339502edd71c Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 20 Feb 2024 10:12:02 +0100 Subject: [PATCH 11/21] VMware: Fix guestinfo.*.config.data and *.config.url @@ -164,5 +164,5 @@ index 1d40249c..a0833794 100644 func delConfig(f *resource.Fetcher) error { -- -2.43.0 +2.43.2 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 d4db79c1557..d01bd1b94d3 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 2f9915956c2432fcea70be92f046bbdb47b4d16b Mon Sep 17 00:00:00 2001 +From 9807190a06785b5db97247fc5c5e4923aff8cd00 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.43.0 +2.43.2 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 22e0c59edc4..17c2c7574ab 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 13b9dd461277caf30651ef3cf01e996116e8dc62 Mon Sep 17 00:00:00 2001 +From 638828473be2eda1277ec1e1891b951c771de6de 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.43.0 +2.43.2 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 5cef25a6120..e533bba0bb1 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch @@ -1,4 +1,4 @@ -From cda121656f3e45efe9b034718b7f0928c5fcdfe8 Mon Sep 17 00:00:00 2001 +From 21f26593b93415a632449d05e787237d29c79ba3 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" @@ -81,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 f0318339..88da2a8e 100644 +index 8dc0feb1..e7dd1dd4 100644 --- a/docs/supported-platforms.md +++ b/docs/supported-platforms.md -@@ -11,6 +11,7 @@ Ignition is currently only supported for the following platforms: +@@ -12,6 +12,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. @@ -93,7 +93,7 @@ index f0318339..88da2a8e 100644 * [CloudStack] (`cloudstack`) - Ignition will read its configuration from the instance userdata via either metadata service or config drive. Cloud SSH keys are handled separately. * [DigitalOcean] (`digitalocean`) - Ignition will read its configuration from the droplet userdata. Cloud SSH keys and network configuration are handled separately. diff --git a/internal/distro/distro.go b/internal/distro/distro.go -index 703385ea..644c42c4 100644 +index 35c65721..3886ab56 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go @@ -23,13 +23,17 @@ import ( @@ -115,8 +115,8 @@ index 703385ea..644c42c4 100644 // Helper programs groupaddCmd = "groupadd" -@@ -79,11 +83,14 @@ var ( - resultFilePath = "/etc/.ignition-result.json" +@@ -82,11 +86,14 @@ var ( + luksCexSecureKeyRepo = "/etc/zkey/repository/" ) -func DiskByLabelDir() string { return diskByLabelDir } @@ -271,5 +271,5 @@ index 8ccf9399..7b13c242 100644 + ) +} -- -2.43.0 +2.43.2 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 7d6169446e3..ac88ac22a61 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 1b90dc1f23b4b1f17fa6caf0722f63e750eab888 Mon Sep 17 00:00:00 2001 +From 7d1b3ded6d9f252cef23198c9e309d3120a2aee0 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 7b13c242..6b9f20c6 100644 return nil -- -2.43.0 +2.43.2 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch index c4e6431db1c..e8a29106098 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch @@ -1,4 +1,4 @@ -From 9ef66f2c472d90b1040a07722c135937a42cc092 Mon Sep 17 00:00:00 2001 +From 0e91455c9075e7605e72f5ca4a932ca94ee24635 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 10 Nov 2022 11:58:49 +0100 Subject: [PATCH 16/21] translation: support OEM and oem @@ -157,5 +157,5 @@ index e81f6bed..68c07109 100644 + } +} -- -2.43.0 +2.43.2 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch index a144b59edc4..df8ecf4e457 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch @@ -1,4 +1,4 @@ -From 8c5952d20e569133ac34e7e6a37367e8276d24b6 Mon Sep 17 00:00:00 2001 +From 20943aff39cc77fd27b61e17e0799d4d1c9c6b6e 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 @@ -42,5 +42,5 @@ index 8a5c2362..9b764e09 100644 func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { -- -2.43.0 +2.43.2 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch index d20d6e35d19..a622f41e06f 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch @@ -1,4 +1,4 @@ -From 01ed9c42af46ec218b4c7c8c4f28083e20bd8cd0 Mon Sep 17 00:00:00 2001 +From 5a7e0b9d6334983c95cb2457b75ea87bdd9f9837 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 4 Mar 2024 15:05:14 +0100 Subject: [PATCH 18/21] docs: Add re-added platforms to docs to pass tests @@ -10,10 +10,10 @@ Co-Authored-By: Krzesimir Nowak Date: Tue, 4 Apr 2023 12:12:42 +0200 Subject: [PATCH 19/21] /usr/share/oem -> /oem @@ -22,7 +22,7 @@ index 347d148c..d4c057b2 100644 // generate a new path fsMap[name] = "/tmp/" + name + "-ign" + strconv.FormatUint(addedSuffixCounter, 10) diff --git a/internal/distro/distro.go b/internal/distro/distro.go -index 644c42c4..9e96166e 100644 +index 3886ab56..79fa8712 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go @@ -32,7 +32,10 @@ var ( @@ -38,5 +38,5 @@ index 644c42c4..9e96166e 100644 // Helper programs -- -2.43.0 +2.43.2 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch index 026bad63368..45ce61b0e46 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch @@ -1,4 +1,4 @@ -From 2fb53dec351d8560cf8ebf6f9ab0edc897f99a22 Mon Sep 17 00:00:00 2001 +From 35cf5f09178b1ab2dfbc7ab04bd9339c5826c21e Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 May 2023 17:43:43 +0200 Subject: [PATCH 20/21] internal/exec/stages/mount: Mount /oem @@ -28,5 +28,5 @@ index ecf7ce7f..395e772a 100644 if err := checkForNonDirectories(path); err != nil { return err -- -2.43.0 +2.43.2 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-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 index b8144361427..8f3e73e652a 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-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,4 +1,4 @@ -From 850da330f5a01fae0e1dc2d44b0a2fcdcbac037a Mon Sep 17 00:00:00 2001 +From 80acac964852b58d835be246bacc8dd8f576ab75 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Fri, 29 Sep 2023 18:06:09 +0200 Subject: [PATCH 21/21] sgdisk: Run partprobe after partition changes @@ -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 340452b9..e1390f6d 100755 +index 3ac9c11c..7955f8f9 100755 --- a/dracut/30ignition/module-setup.sh +++ b/dracut/30ignition/module-setup.sh @@ -40,6 +40,7 @@ install() { @@ -27,7 +27,7 @@ index 340452b9..e1390f6d 100755 userdel \ usermod \ diff --git a/internal/distro/distro.go b/internal/distro/distro.go -index 9e96166e..04544dbf 100644 +index 79fa8712..239e4268 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go @@ -44,6 +44,7 @@ var ( @@ -38,7 +38,7 @@ index 9e96166e..04544dbf 100644 modprobeCmd = "modprobe" udevadmCmd = "udevadm" usermodCmd = "usermod" -@@ -100,6 +101,7 @@ func GroupdelCmd() string { return groupdelCmd } +@@ -103,6 +104,7 @@ func GroupdelCmd() string { return groupdelCmd } func MdadmCmd() string { return mdadmCmd } func MountCmd() string { return mountCmd } func SgdiskCmd() string { return sgdiskCmd } @@ -63,5 +63,5 @@ index 136aca67..5f9d399a 100644 return nil } -- -2.43.0 +2.43.2 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.18.0.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.19.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.18.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.19.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 491e48d419c..ff5f321194b 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="0abc4078a1bb40077c3e094fc3d70a8dbcb7ec02" # v2.18.0 + CROS_WORKON_COMMIT="09c99e0305adc1377b87964a39ad2d009aec9b12" # v2.19.0 KEYWORDS="amd64 arm64" fi