Update ignition to 2.24.0

Patches were reordered a bit, e.g. combining the
"mod-add-flatcar-ignition-0.36.2" and "sum-go-mod-tidy" patches and
moving "config-v3_6-convert-ignition-2.x-to-3.x" before
"vendor-go-mod-vendor" (so that the dependencies added by the former are
vendored in the latter).

Built and tested with the yet-unpublished UpCloud OEM.

Signed-off-by: Mara Sophie Grosch <[email protected]>

Author: LittleFox94

changelog/updates/2025-12-03-ignition.md

@@ -0,0 +1 @@
+- Ignition ([2.24.0](https://coreos.github.io/ignition/release-notes/#ignition-2240-2024-10-14))

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/Manifest

@@ -1 +1 @@
-DIST ignition-2.22.0.tar.gz 8262012 BLAKE2B f6406c88a9085dcc2c75a28a31ff9a67377745c55cc909e6e1fd4443f522004bc4a5c3d7c41d317e81b014dea2b96a16cbe4072173b8af7a6db7081b45741d01 SHA512 fd9fbe28b77c0593c4ca3f7d08fcb46c56c29d8fd4365c37856b8ccfd178d3cbb44dbe15effcfada3da851bece893edfe2b4de2c4873a90c909322a8c806143a
+DIST ignition-2.24.0.tar.gz 8569157 BLAKE2B ffc97b24ff723955eb1b03cade7ef16bbcc544ef89730895148019d50869c381525398ae4b253976601ce17ad4d7436a844cd1011c2d17b07efa9802a11b1d23 SHA512 45316c9ae10588ab6615e719d3ab8096ac67320d7c046c6777f502637fd05f1b9aecd00dddec352d18cfdd537c0a4f5fb42160b4697deccd401b67a8939fabd3

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch

@@ -1,7 +1,7 @@
-From a06550ff7294cde7367802b22f45b147a11d0324 Mon Sep 17 00:00:00 2001
+From f1324cc831035f3bf9ac0001192694537ac40608 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
+Subject: [PATCH 02/19] config: add ignition translation
 
 it's a merge from flatcar/ign-converter
 
@@ -2621,5 +2621,5 @@ index 00000000..e81f6bed
 +	}
 +}
 -- 
-2.49.1
+2.51.0
 

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch

@@ -1,7 +1,7 @@
-From 1c451c17c202fa1a27888bfe76d192e077d13ab8 Mon Sep 17 00:00:00 2001
+From 60e42b49e60202310a0fd38c468191eaba9fca28 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
+Subject: [PATCH 04/19] config/v3_6: convert ignition 2.x to 3.x
 
 if the version of ignition is 2.x we convert it to 3.x using
 ign-converter.
@@ -72,5 +72,5 @@ index 3be26cae..ea367663 100644
  		return Parse(raw)
  	}
 -- 
-2.49.1
+2.51.0
 

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch

@@ -1,7 +1,7 @@
-From c2f572be6f33034b1f810fd463a42d11e71e7168 Mon Sep 17 00:00:00 2001
+From a063a1dc15568f90e3192ae1250d2aee6677d103 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
 Date: Tue, 12 Aug 2025 15:10:57 +0200
-Subject: [PATCH 05/20] vendor: go mod vendor
+Subject: [PATCH 05/19] vendor: go mod vendor
 
 Signed-off-by: Mathieu Tortuyaux <[email protected]>
 ---
@@ -17029,30 +17029,30 @@ index 00000000..1b1efb0f
 +	return
 +}
 diff --git a/vendor/modules.txt b/vendor/modules.txt
-index 1e5cbab2..3d3bae00 100644
+index 2b1e4041..0161a31b 100644
 --- a/vendor/modules.txt
 +++ b/vendor/modules.txt
-@@ -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
+@@ -132,6 +132,9 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric
+ # github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0
+ ## explicit; go 1.23.0
  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.7
- ## explicit; go 1.19
- github.com/aws/aws-sdk-go/aws
-@@ -209,6 +212,9 @@ github.com/coreos/go-json
+ # github.com/aws/aws-sdk-go-v2 v1.39.2
+ ## explicit; go 1.22
+ github.com/aws/aws-sdk-go-v2/aws
+@@ -255,6 +258,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
 +## 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 v22.6.0
+ ## explicit; go 1.23
  github.com/coreos/go-systemd/v22/dbus
-@@ -270,6 +276,27 @@ github.com/envoyproxy/protoc-gen-validate/validate
+@@ -316,6 +322,27 @@ github.com/envoyproxy/protoc-gen-validate/validate
  # github.com/felixge/httpsnoop v1.0.4
  ## explicit; go 1.13
  github.com/felixge/httpsnoop
@@ -17077,19 +17077,19 @@ index 1e5cbab2..3d3bae00 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-jose/go-jose/v4 v4.0.5
- ## explicit; go 1.21
+ # github.com/go-jose/go-jose/v4 v4.1.1
+ ## explicit; go 1.23.0
  github.com/go-jose/go-jose/v4
-@@ -456,6 +483,9 @@ go.opentelemetry.io/otel/trace
+@@ -500,6 +527,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.39.0
- ## explicit; go 1.23.0
+ # golang.org/x/crypto v0.43.0
+ ## explicit; go 1.24.0
  golang.org/x/crypto/chacha20
 -- 
-2.49.1
+2.51.0
 

…g-v3_6-convert-ignition-2.x-to-3.x.patch …g-v3_6-convert-ignition-2.x-to-3.x.patchsdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_6-convert-ignition-2.x-to-3.x.patch renamed to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-config-v3_6-convert-ignition-2.x-to-3.x.patch sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_6-convert-ignition-2.x-to-3.x.patch renamed to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-config-v3_6-convert-ignition-2.x-to-3.x.patch

@@ -1,7 +1,7 @@
-From f84e3ffe1e864515a4552c457268db801277380d Mon Sep 17 00:00:00 2001
+From aafc9c756610faffad5bf28eb2c4661e6df5b4b9 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
+Subject: [PATCH 06/19] internal/prv/cmdline: backport flatcar patch
 
 this patch provides backward compatibility for various config
 key
@@ -36,5 +36,5 @@ index 30203bff..86a5cb79 100644
  		}
 
 -- 
-2.49.1
+2.51.0