Update for 3.5.0 spec

coreos · Nov 6, 2024 · 26af96c · 26af96c
1 parent 8096238
commit 26af96c
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -2,9 +2,7 @@
 
 ## Upcoming ignition-config 0.5.0 (unreleased)
 
-
-## ignition-config 0.4.2 (unreleased)
-
+- Add Ignition 3.5.0 spec
 - Update packit's downstream targets to be `fedora-rawhide`
 
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -21,6 +21,7 @@ pub mod v3_1;
 pub mod v3_2;
 pub mod v3_3;
 pub mod v3_4;
+pub mod v3_5;
 
 type Result<T> = std::result::Result<T, Error>;
 
@@ -53,6 +54,7 @@ pub enum Config {
     V3_2(v3_2::Config),
     V3_3(v3_3::Config),
     V3_4(v3_4::Config),
+    V3_5(v3_5::Config),
 }
 
 impl Config {
@@ -75,6 +77,8 @@ impl Config {
             Self::V3_3(parse_warn(v, &mut warnings)?)
         } else if version == v3_4::VERSION {
             Self::V3_4(parse_warn(v, &mut warnings)?)
+        } else if version == v3_5::VERSION {
+            Self::V3_5(parse_warn(v, &mut warnings)?)
         } else {
             return Err(Error::UnknownVersion(version));
         };

diff --git a/src/v3_5/ignition.json b/src/v3_5/ignition.json
@@ -266,6 +266,9 @@
             "clevis": {
               "$ref": "#/definitions/storage/definitions/clevis"
             },
+            "cex": {
+              "$ref": "#/definitions/storage/definitions/cex"
+            },
             "options": {
               "type": "array",
               "items": {
@@ -334,6 +337,14 @@
             }
           }
         },
+        "cex": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": ["boolean", "null"]
+            }
+          }
+        },
         "filesystem": {
           "type": "object",
           "properties": {

diff --git a/src/v3_5/mod.rs b/src/v3_5/mod.rs
@@ -21,7 +21,7 @@
 use semver::Version;
 use serde::{Deserialize, Serialize};
 
-pub(crate) const VERSION: Version = Version::new(3, 4, 0);
+pub(crate) const VERSION: Version = Version::new(3, 5, 0);
 
 include!("schema.rs");
 

diff --git a/src/v3_5/schema.rs b/src/v3_5/schema.rs
@@ -197,6 +197,12 @@ pub struct Resource {
     pub verification: Option<Verification>,
 }
 #[derive(Clone, PartialEq, Debug, Default, Deserialize, Serialize)]
+#[serde(rename = "cex")]
+pub struct Cex {
+    #[serde(default)]
+    pub enabled: Option<bool>,
+}
+#[derive(Clone, PartialEq, Debug, Default, Deserialize, Serialize)]
 #[serde(rename = "clevis")]
 pub struct Clevis {
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -358,6 +364,8 @@ impl Link {
 #[derive(Clone, PartialEq, Debug, Deserialize, Serialize)]
 #[serde(rename = "luks")]
 pub struct Luks {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cex: Option<Cex>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub clevis: Option<Clevis>,
     #[serde(default)]
@@ -384,6 +392,7 @@ pub struct Luks {
 impl Luks {
     pub fn new(name: String) -> Self {
         Self {
+            cex: None,
             clevis: None,
             device: None,
             discard: None,