From fe4bade05e490ec06f487c8a1129f3ad8d422258 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Wed, 5 Apr 2023 12:52:39 -0700 Subject: [PATCH] Update raw Ignition examples to use Ignition spec v3.4.0 * Regenerate example Ignition using fcct v0.18.0 to produce Ignition spec v3.4.0 as a followup to https://github.com/poseidon/matchbox/pull/1079 * Fix one profile example where a double escape isn't needed --- CHANGES.md | 4 ++-- examples/ignition/fedora-coreos.ign | 2 +- examples/ignition/flatcar-install.ign | 2 +- examples/ignition/flatcar.ign | 2 +- examples/profiles/fedora-coreos-install.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index fb0b700a..81c03a3b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,10 +4,10 @@ Notable changes between releases. ## Latest -* Update butane from v0.17.0 to v0.18.0 +* Update butane from v0.17.0 to v0.18.0 ([#1079](https://github.com/poseidon/matchbox/pull/1079)) * Add support for `fcos` [v1.5.0](https://coreos.github.io/butane/config-fcos-v1_5/) Butane Configs * Add support for `flatcar` [v1.1.0](https://coreos.github.io/butane/config-flatcar-v1_1/) Butane Configs -* Render Ignition as Ignition spec [v3.4.0](https://coreos.github.io/ignition/configuration-v3_4/) + * Render Ignition as Ignition spec [v3.4.0](https://coreos.github.io/ignition/configuration-v3_4/) ## v0.10.0 diff --git a/examples/ignition/fedora-coreos.ign b/examples/ignition/fedora-coreos.ign index 393a4ef4..ac3b2353 100644 --- a/examples/ignition/fedora-coreos.ign +++ b/examples/ignition/fedora-coreos.ign @@ -1,6 +1,6 @@ { "ignition": { - "version": "3.3.0" + "version": "3.4.0" }, "passwd": { "users": [ diff --git a/examples/ignition/flatcar-install.ign b/examples/ignition/flatcar-install.ign index e35d18e4..94c4ab00 100644 --- a/examples/ignition/flatcar-install.ign +++ b/examples/ignition/flatcar-install.ign @@ -1,6 +1,6 @@ { "ignition": { - "version": "3.3.0" + "version": "3.4.0" }, "passwd": { "users": [ diff --git a/examples/ignition/flatcar.ign b/examples/ignition/flatcar.ign index 393a4ef4..ac3b2353 100644 --- a/examples/ignition/flatcar.ign +++ b/examples/ignition/flatcar.ign @@ -1,6 +1,6 @@ { "ignition": { - "version": "3.3.0" + "version": "3.4.0" }, "passwd": { "users": [ diff --git a/examples/profiles/fedora-coreos-install.json b/examples/profiles/fedora-coreos-install.json index 47b1844e..2cae48af 100644 --- a/examples/profiles/fedora-coreos-install.json +++ b/examples/profiles/fedora-coreos-install.json @@ -10,7 +10,7 @@ "initrd=main", "coreos.live.rootfs_url=http://matchbox.example.com:8080/assets/fedora-coreos/fedora-coreos-36.20220906.3.2-live-rootfs.x86_64.img", "coreos.inst.install_dev=/dev/vda", - "coreos.inst.ignition_url=http://matchbox.example.com:8080/ignition?uuid=$${uuid}&mac=$${mac:hexhyp}" + "coreos.inst.ignition_url=http://matchbox.example.com:8080/ignition?uuid=${uuid}&mac=${mac:hexhyp}" ] }, "ignition_id": "fedora-coreos.ign"