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
2 changes: 1 addition & 1 deletion changelog/updates/2026-08-26-ignition.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
- Ignition ([2.26.0](https://coreos.github.io/ignition/release-notes/#ignition-2260-2026-02-17) (includes [2.25.1](https://coreos.github.io/ignition/release-notes/#ignition-2260-2026-02-17), [2.25.0](https://coreos.github.io/ignition/release-notes/#ignition-2250-2025-12-11)))
- Ignition ([2.27.0](https://coreos.github.io/ignition/release-notes/#ignition-2270-2026-08-26) (includes [2.26.0](https://coreos.github.io/ignition/release-notes/#ignition-2260-2026-02-17), [2.25.1](https://coreos.github.io/ignition/release-notes/#ignition-2251-2025-12-22), [2.25.0](https://coreos.github.io/ignition/release-notes/#ignition-2250-2025-12-11)))
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DIST coreos-init-3f8581468918512566a35974fe18479c7a353098.tar.gz 60356 BLAKE2B 8cab828dae68cf59a4cfd4aa12c190f2f33d0fe57089c3989317fee11f7cd7b79ca925d2095e508ec5327dd73d81e198e401cee58fd36b96989668c7eb4298fc SHA512 1b6311e5607dcac8b512cc0843b7b91764c256ff5b94bc06c5be4bbdf013c5e0d14570e50c51ad756db71d8ac2fa3068291b3fa942bd3b97051d142a940a7de3
DIST coreos-init-77ffa2ca15cc4a78fda1268ed830bd15604b6533.tar.gz 60347 BLAKE2B acf7a0a28026fcf2d215bca9749f3fc2b78020fbae1b99ee8506191a10cfc49564684fe73ac11c8cac88486789d4263fce82c4d9e4686df800593b7654e44105 SHA512 49ec6c0c4353611f310c34fa7dd304cac55eece8ff74255da19b6cd45d70124f8f3a8a9a7928707220a0a4c7610b827bd9669ef2105008a80b88d9e14cb0ab59
Comment thread
chewi marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/flatcar/init.git"
inherit git-r3
else
EGIT_VERSION="3f8581468918512566a35974fe18479c7a353098" # flatcar-master
EGIT_VERSION="77ffa2ca15cc4a78fda1268ed830bd15604b6533" # flatcar-master
SRC_URI="https://github.com/flatcar/init/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz"
S="${WORKDIR}/init-${EGIT_VERSION}"
KEYWORDS="amd64 arm arm64 x86"
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DIST ignition-2.26.0.tar.gz 8519852 BLAKE2B 9194fa46b604c2ecb29fc74e9acbd63998c0331e59ffe71aca789dd4a3e036a6021e67d7085b28f52510b0d76f79c8934adb6d44f17b45a2685c500399d47a9c SHA512 365072e3b9d11be9e0e6008d2e7fbff5a6583f393a9b1860d95ee4bccde1680306d0d063e844dd1ea59968ea4661105210d9c17cf6001a9c1d04a1861505406e
DIST ignition-2.27.0.tar.gz 4333458 BLAKE2B d8c76132621fce6053972ba45a3a70acfdfd9a212ca305a971e93741e9c37c09d67d07e9cbe6361a4c3cda1debe88587b47af4dc1557f65b3dc905b913c6245a SHA512 7f1ad2da57a196ba0d01b7f2f886f1484edb1f48b8f295f1ad9a4ef9ba2801f0d9d3e9701ec266b4a2446bbf182c50c6733b5ca069ac0c749d77ed342d6a6a9e
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
From f57b41faa275285dafb9df26285e35dd34722738 Mon Sep 17 00:00:00 2001
From 70dd79997dd9766d49a9e847d6b293b10e90198c Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Mon, 26 Sep 2022 12:12:04 +0200
Subject: [PATCH 02/19] config: add ignition translation
Subject: [PATCH 01/15] config: add ignition translation

it's a merge from flatcar/ign-converter

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
config/util/translate.go | 166 +++
config/v24tov31/v24tov31.go | 729 +++++++++++++
config/v24tov31/v24tov31.go | 728 +++++++++++++
config/v24tov31/v24tov31_test.go | 1692 ++++++++++++++++++++++++++++++
3 files changed, 2587 insertions(+)
3 files changed, 2586 insertions(+)
create mode 100644 config/util/translate.go
create mode 100644 config/v24tov31/v24tov31.go
create mode 100644 config/v24tov31/v24tov31_test.go
Expand Down Expand Up @@ -189,10 +189,10 @@ index 00000000..347d148c
+}
diff --git a/config/v24tov31/v24tov31.go b/config/v24tov31/v24tov31.go
new file mode 100644
index 00000000..46749385
index 00000000..dd8d2d00
--- /dev/null
+++ b/config/v24tov31/v24tov31.go
@@ -0,0 +1,729 @@
@@ -0,0 +1,728 @@
+// Copyright 2020 Red Hat, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -217,13 +217,12 @@ index 00000000..46749385
+ "path/filepath"
+ "reflect"
+
+ old "github.com/flatcar/ignition/config/v2_4/types"
+ oldValidate "github.com/flatcar/ignition/config/validate"
+ "github.com/flatcar/ignition/v2/config/merge"
+ "github.com/flatcar/ignition/v2/config/v3_1/types"
+ "github.com/flatcar/ignition/v2/config/validate"
+ "github.com/flatcar/ignition/v2/config/util"
+
+ old "github.com/coreos/ignition/config/v2_4/types"
+ oldValidate "github.com/coreos/ignition/config/validate"
+ "github.com/coreos/ignition/v2/config/merge"
+ "github.com/coreos/ignition/v2/config/util"
+ "github.com/coreos/ignition/v2/config/v3_1/types"
+ "github.com/coreos/ignition/v2/config/validate"
+)
+
+// Check2_4 returns if the config is translatable but does not do any translation.
Expand Down Expand Up @@ -924,7 +923,7 @@ index 00000000..46749385
+}
diff --git a/config/v24tov31/v24tov31_test.go b/config/v24tov31/v24tov31_test.go
new file mode 100644
index 00000000..e81f6bed
index 00000000..17f7c00c
--- /dev/null
+++ b/config/v24tov31/v24tov31_test.go
@@ -0,0 +1,1692 @@
Expand All @@ -948,13 +947,13 @@ index 00000000..e81f6bed
+ "fmt"
+ "testing"
+
+ types2_4 "github.com/flatcar/ignition/config/v2_4/types"
+ types3_1 "github.com/flatcar/ignition/v2/config/v3_1/types"
+ types2_4 "github.com/coreos/ignition/config/v2_4/types"
+ types3_1 "github.com/coreos/ignition/v2/config/v3_1/types"
+
+ "github.com/stretchr/testify/assert"
+
+ "github.com/flatcar/ignition/v2/config/util"
+ "github.com/flatcar/ignition/v2/config/v24tov31"
+ "github.com/coreos/ignition/v2/config/util"
+ "github.com/coreos/ignition/v2/config/v24tov31"
+)
+
+// Configs using _all_ the (undeprecated) fields
Expand Down Expand Up @@ -2621,5 +2620,5 @@ index 00000000..e81f6bed
+ }
+}
--
2.54.0
2.55.0

Loading