Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/updates/2025-08-12-ignition.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Ignition ([2.22.0](https://coreos.github.io/ignition/release-notes/#ignition-2220-2025-07-08))
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DIST ignition-2.22.0.tar.gz 8262012 BLAKE2B f6406c88a9085dcc2c75a28a31ff9a67377745c55cc909e6e1fd4443f522004bc4a5c3d7c41d317e81b014dea2b96a16cbe4072173b8af7a6db7081b45741d01 SHA512 fd9fbe28b77c0593c4ca3f7d08fcb46c56c29d8fd4365c37856b8ccfd178d3cbb44dbe15effcfada3da851bece893edfe2b4de2c4873a90c909322a8c806143a

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 42358eaa661444c3d5d07c4b52f8879372adaacf Mon Sep 17 00:00:00 2001
From a06550ff7294cde7367802b22f45b147a11d0324 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <[email protected]>
Date: Mon, 26 Sep 2022 12:12:04 +0200
Subject: [PATCH 02/20] config: add ignition translation
Expand Down Expand Up @@ -2621,5 +2621,5 @@ index 00000000..e81f6bed
+ }
+}
--
2.45.3
2.49.1

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 99d75703026de8787b4bb83e77bd07d1f6d730b9 Mon Sep 17 00:00:00 2001
From ee56f2df58941892c102869290a52450f9727f83 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <[email protected]>
Date: Wed, 26 Mar 2025 15:10:08 +0100
Date: Tue, 12 Aug 2025 15:10:05 +0200
Subject: [PATCH 03/20] mod: add flatcar/[email protected]

it's required for Ignition conversion.
Expand All @@ -11,37 +11,37 @@ Signed-off-by: Mathieu Tortuyaux <[email protected]>
1 file changed, 4 insertions(+)

diff --git a/go.mod b/go.mod
index f94bbafa..2afaf4ae 100644
index a34e8f5e..be20c337 100644
--- a/go.mod
+++ b/go.mod
@@ -14,6 +14,7 @@ require (
@@ -15,6 +15,7 @@ require (
github.com/coreos/go-semver v0.3.1
github.com/coreos/go-systemd/v22 v22.5.0
github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687
+ github.com/flatcar/ignition v0.36.2
github.com/google/renameio/v2 v2.0.0
github.com/google/uuid v1.6.0
github.com/mdlayher/vsock v1.2.1
@@ -43,9 +44,11 @@ require (
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
@@ -44,9 +45,11 @@ require (
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
+ github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb // indirect
+ github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
@@ -75,6 +78,7 @@ require (
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
go.opentelemetry.io/otel/trace v1.34.0 // indirect
@@ -77,6 +80,7 @@ require (
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
go.opentelemetry.io/otel/trace v1.36.0 // indirect
+ go4.org v0.0.0-20160314031811-03efcb870d84 // indirect
golang.org/x/crypto v0.36.0 // indirect
golang.org/x/sync v0.12.0 // indirect
golang.org/x/text v0.23.0 // indirect
golang.org/x/crypto v0.39.0 // indirect
golang.org/x/sync v0.15.0 // indirect
golang.org/x/text v0.26.0 // indirect
--
2.45.3
2.49.1

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From e36800fa55585c4db32a60b6c8c74bb0b3e4b17e Mon Sep 17 00:00:00 2001
From c2f572be6f33034b1f810fd463a42d11e71e7168 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <[email protected]>
Date: Wed, 26 Mar 2025 15:11:11 +0100
Date: Tue, 12 Aug 2025 15:10:57 +0200
Subject: [PATCH 05/20] vendor: go mod vendor

Signed-off-by: Mathieu Tortuyaux <[email protected]>
Expand Down Expand Up @@ -17029,20 +17029,20 @@ index 00000000..1b1efb0f
+ return
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 888d509e..984b721c 100644
index 1e5cbab2..3d3bae00 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -128,6 +128,9 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric
# github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1
## explicit; go 1.21
@@ -129,6 +129,9 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric
# github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0
## explicit; go 1.22
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping
+# github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437
+## explicit
+github.com/ajeddeloh/go-json
# github.com/aws/aws-sdk-go v1.55.6
# github.com/aws/aws-sdk-go v1.55.7
## explicit; go 1.19
github.com/aws/aws-sdk-go/aws
@@ -208,6 +211,9 @@ github.com/coreos/go-json
@@ -209,6 +212,9 @@ github.com/coreos/go-json
# github.com/coreos/go-semver v0.3.1
## explicit; go 1.8
github.com/coreos/go-semver/semver
Expand All @@ -17052,7 +17052,7 @@ index 888d509e..984b721c 100644
# github.com/coreos/go-systemd/v22 v22.5.0
## explicit; go 1.12
github.com/coreos/go-systemd/v22/dbus
@@ -269,6 +275,27 @@ github.com/envoyproxy/protoc-gen-validate/validate
@@ -270,6 +276,27 @@ github.com/envoyproxy/protoc-gen-validate/validate
# github.com/felixge/httpsnoop v1.0.4
## explicit; go 1.13
github.com/felixge/httpsnoop
Expand All @@ -17077,19 +17077,19 @@ index 888d509e..984b721c 100644
+github.com/flatcar/ignition/config/validate/astjson
+github.com/flatcar/ignition/config/validate/astnode
+github.com/flatcar/ignition/config/validate/report
# github.com/go-logr/logr v1.4.2
## explicit; go 1.18
github.com/go-logr/logr
@@ -447,6 +474,9 @@ go.opentelemetry.io/otel/sdk/metric/metricdata
go.opentelemetry.io/otel/trace
# github.com/go-jose/go-jose/v4 v4.0.5
## explicit; go 1.21
github.com/go-jose/go-jose/v4
@@ -456,6 +483,9 @@ go.opentelemetry.io/otel/trace
go.opentelemetry.io/otel/trace/embedded
go.opentelemetry.io/otel/trace/internal/telemetry
go.opentelemetry.io/otel/trace/noop
+# go4.org v0.0.0-20160314031811-03efcb870d84
+## explicit
+go4.org/errorutil
# golang.org/x/crypto v0.36.0
# golang.org/x/crypto v0.39.0
## explicit; go 1.23.0
golang.org/x/crypto/chacha20
--
2.45.3
2.49.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0217fb3e21f9acff70ccaff3c0c6fa8a105df1d0 Mon Sep 17 00:00:00 2001
From 1c451c17c202fa1a27888bfe76d192e077d13ab8 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <[email protected]>
Date: Thu, 24 Oct 2024 10:20:45 +0200
Subject: [PATCH 06/20] config/v3_6: convert ignition 2.x to 3.x
Expand Down Expand Up @@ -72,5 +72,5 @@ index 3be26cae..ea367663 100644
return Parse(raw)
}
--
2.45.3
2.49.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f82805de0aa6defb2f641facfb2fabf07cc1953a Mon Sep 17 00:00:00 2001
From f84e3ffe1e864515a4552c457268db801277380d Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <[email protected]>
Date: Mon, 19 Feb 2024 18:12:22 +0100
Subject: [PATCH 07/20] internal/prv/cmdline: backport flatcar patch
Expand Down Expand Up @@ -36,5 +36,5 @@ index 30203bff..86a5cb79 100644
}

--
2.45.3
2.49.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From bcc67f65dbcbe6d66d0fb8c96c1ee183585da6f9 Mon Sep 17 00:00:00 2001
From e968bb45604b48e25815af7ce84baa46ec3cb221 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <[email protected]>
Date: Tue, 20 Feb 2024 10:02:28 +0100
Subject: [PATCH 08/20] provider/qemu: apply fw_cfg patch
Expand Down Expand Up @@ -159,5 +159,5 @@ index 389ec119..cab9c476 100644
+
}
--
2.45.3
2.49.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c2c5e782e3e7d7c2a8699597059bac2614e698ed Mon Sep 17 00:00:00 2001
From 158a17fe6da1c9e30f8d177e375a7424e19954b4 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <[email protected]>
Date: Thu, 2 Sep 2021 11:03:17 +0200
Subject: [PATCH 09/20] config/3_6/test: add ignition 2.x test cases
Expand Down Expand Up @@ -40,5 +40,5 @@ index 54cbd91c..99f2e3dd 100644
in: in{config: []byte(`{"ignition": {"version": "3.0.0"}}`)},
out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}},
--
2.45.3
2.49.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 459ff2f9890250ae027aa50b96dac125f8ae8a65 Mon Sep 17 00:00:00 2001
From d4cbad99a8dfce27c34d6373b49c50b3a2942bb3 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <[email protected]>
Date: Wed, 22 Sep 2021 14:53:49 +0200
Subject: [PATCH 10/20] internal/disk/fs: ignore fs format mismatches for the
Expand Down Expand Up @@ -35,5 +35,5 @@ index c575ced4..fefd1fff 100644
(fs.UUID == nil || canonicalizeFilesystemUUID(info.Type, info.UUID) == canonicalizeFilesystemUUID(fileSystemFormat, *fs.UUID)) {
s.Logger.Info("filesystem at %q is already correctly formatted. Skipping mkfs...", fs.Device)
--
2.45.3
2.49.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 67c775d6c1c7706ba1437c827e60c8f38544c1f8 Mon Sep 17 00:00:00 2001
From d4896d39233152d8fb772fa509a7d02134980fe8 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <[email protected]>
Date: Tue, 20 Feb 2024 10:12:02 +0100
Subject: [PATCH 11/20] VMware: Fix guestinfo.*.config.data and *.config.url
Expand Down Expand Up @@ -164,5 +164,5 @@ index 597c33fd..3680a4cd 100644

func delConfig(f *resource.Fetcher) error {
--
2.45.3
2.49.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2a7d30599956087db90b260dcb75fbc0762d95da Mon Sep 17 00:00:00 2001
From 036b7ac1ccb58b628698e252e19009a8d6ee39e9 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <[email protected]>
Date: Wed, 2 Feb 2022 13:27:18 +0100
Subject: [PATCH 12/20] config/version: handle configuration version 1
Expand Down Expand Up @@ -49,5 +49,5 @@ index 3b9bb22f..f81056fa 100644
return semver.Version{}, report.Report{}, errors.ErrInvalidVersion
}
--
2.45.3
2.49.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From fe115de47cff4745b46c0c045a51c3a66150c5f9 Mon Sep 17 00:00:00 2001
From d888888eb3e6eaad7fba6b62e3245d25576a19b9 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <[email protected]>
Date: Tue, 22 Feb 2022 15:41:13 +0100
Subject: [PATCH 13/20] config/util: add cloud init detection to initial
Expand Down Expand Up @@ -90,5 +90,5 @@ index 865d75d2..313d42ea 100644
if err == nil {
return report.Report{}, nil
--
2.45.3
2.49.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 67b8b674471fc8bf16a9e65692b2cf13637f60d0 Mon Sep 17 00:00:00 2001
From 70d0e48e5339081461a4a6815a07ee80e0d39310 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <[email protected]>
Date: Wed, 25 May 2022 10:38:16 +0200
Subject: [PATCH 14/20] Revert "*: drop OEM URI support"
Expand Down Expand Up @@ -81,7 +81,7 @@ index 9b2b4405..5258c3c6 100644
case "s3":
if v, ok := u.Query()["versionId"]; ok {
diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md
index d2434e2e..9e80ed2a 100644
index 5f508761..b81beee0 100644
--- a/docs/supported-platforms.md
+++ b/docs/supported-platforms.md
@@ -12,6 +12,7 @@ Ignition is currently supported for the following platforms:
Expand Down Expand Up @@ -271,5 +271,5 @@ index 354385fa..f7b855d8 100644
+ )
+}
--
2.45.3
2.49.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0ab0dca4211dc835bb9b7f4402f9e3c6ccb1dc46 Mon Sep 17 00:00:00 2001
From 0b656bf09a53e721c6175e868dedf2904d3f15bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20L=C3=BCke?= <[email protected]>
Date: Wed, 7 Jul 2021 18:40:52 +0200
Subject: [PATCH 15/20] internal/resource/url: support btrfs as OEM partition
Expand Down Expand Up @@ -35,5 +35,5 @@ index f7b855d8..e66707fd 100644

return nil
--
2.45.3
2.49.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5cf4125e598ce7f0ab02b4b8fb1ed3a810f05294 Mon Sep 17 00:00:00 2001
From e03851847226e52f6a5eb2224fe9b32b2f4ca592 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <[email protected]>
Date: Thu, 10 Nov 2022 11:58:49 +0100
Subject: [PATCH 16/20] translation: support OEM and oem
Expand Down Expand Up @@ -157,5 +157,5 @@ index e81f6bed..68c07109 100644
+ }
+}
--
2.45.3
2.49.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7ae88250e01d677abdc4a4755fd66984a6328c81 Mon Sep 17 00:00:00 2001
From 198f62a4845d171bbdc73893715da2fb6b4df382 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <[email protected]>
Date: Tue, 20 Feb 2024 10:25:24 +0100
Subject: [PATCH 17/20] revert: internal/oem: drop noop OEMs
Expand Down Expand Up @@ -42,5 +42,5 @@ index 27c923d4..ae259f8f 100644

func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
--
2.45.3
2.49.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d88e7af1759737d4b21adf38655312976587aeb6 Mon Sep 17 00:00:00 2001
From 1e45cd2bea29d19cdce12c6708ae93b53a63e42f Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <[email protected]>
Date: Mon, 4 Mar 2024 15:05:14 +0100
Subject: [PATCH 18/20] docs: Add re-added platforms to docs to pass tests
Expand All @@ -10,7 +10,7 @@ Co-Authored-By: Krzesimir Nowak <[email protected]
1 file changed, 4 insertions(+)

diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md
index 9e80ed2a..7e2ac5a0 100644
index b81beee0..75cf5501 100644
--- a/docs/supported-platforms.md
+++ b/docs/supported-platforms.md
@@ -15,6 +15,7 @@ Ignition is currently supported for the following platforms:
Expand All @@ -21,7 +21,7 @@ index 9e80ed2a..7e2ac5a0 100644
* [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.
@@ -29,6 +30,9 @@ Ignition is currently supported for the following platforms:
@@ -30,6 +31,9 @@ Ignition is currently 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).
Expand All @@ -32,5 +32,5 @@ index 9e80ed2a..7e2ac5a0 100644
* [VirtualBox] (`virtualbox`) - Use the VirtualBox guest property `/Ignition/Config` to provide the config to the virtual machine.
* [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.
--
2.45.3
2.49.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 65cb148ff154d54ed37176cfa08bfc65874236f6 Mon Sep 17 00:00:00 2001
From 0dc08f4751e70db6ad8ca28f37eba52218077d24 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <[email protected]>
Date: Tue, 4 Apr 2023 12:12:42 +0200
Subject: [PATCH 19/20] /usr/share/oem -> /oem
Expand Down Expand Up @@ -38,5 +38,5 @@ index 2726d705..c335eeee 100644

// Helper programs
--
2.45.3
2.49.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From bcb802948375640e30beaca9eac1069426a63a8b Mon Sep 17 00:00:00 2001
From a00ce4cd775722e87f97a529d4ff802f0d7f37c9 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <[email protected]>
Date: Tue, 16 May 2023 17:43:43 +0200
Subject: [PATCH 20/20] internal/exec/stages/mount: Mount /oem
Expand Down Expand Up @@ -28,5 +28,5 @@ index bace4bbd..bc6767d2 100644
if err := checkForNonDirectories(path); err != nil {
return err
--
2.45.3
2.49.1

This file was deleted.

Loading