fix: No default value for advertise routes

.gitea/workflows/audit.yaml

@@ -7,7 +7,6 @@ on:
       - "**/Cargo.lock"
   schedule:
     - cron: "0 0 * * *"
-  workflow_dispatch:
 
 jobs:
   audit:
@@ -23,6 +22,6 @@ jobs:
       - name: Setup rust cache
         uses: Swatinem/rust-cache@v2
       - name: Audit check
-        uses: https://git.huizinga.dev/infra/rust-audit-check@v3.0.0
+        uses: rustsec/audit-check@v2.0.0
         with:
           token: ${{ secrets.GITEA_TOKEN }}

CHANGELOG.md

@@ -7,29 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.1.3](https://git.huizinga.dev/infra/crete/compare/v0.1.2...v0.1.3) - 2026-04-21
-
-### <!-- 0 -->Features
-
-- Add function that applies netmask to ip
-
-### <!-- 3 -->Refactor
-
-- Use ViaDeserialize to convert ip address
-
-## [0.1.2](https://git.huizinga.dev/infra/crete/compare/v0.1.1...v0.1.2) - 2026-04-17
-
-### <!-- 0 -->Features
-
-- Make dns optional
-- Allow more than two dns entries
-
-## [0.1.1](https://git.huizinga.dev/infra/crete/compare/v0.1.0...v0.1.1) - 2026-04-13
-
-### <!-- 2 -->Bug Fixes
-
-- No default value for advertise routes
-
 ## [0.1.0](https://git.huizinga.dev/infra/crete/releases/tag/v0.1.0) - 2026-04-07
 
 ### <!-- 0 -->Features

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "crete"
-version = "0.1.3"
+version = "0.1.0"
 edition = "2024"
 default-run = "crete"
 publish = ["infra"]
@@ -16,7 +16,7 @@ serde_json = "1.0.149"
 [dependencies]
 clap = { version = "4.6.0", features = ["derive"] }
 clap_complete = "4.6.0"
-gix-discover = { version = "0.55.0", features = ["sha1"] }
+gix-discover = { version = "0.49.0", features = ["sha1"] }
 minijinja = { version = "2.18.0", features = ["json", "loader"] }
 optional_struct = "0.5.2"
 reqwest = { version = "0.13.2", default-features = false, features = [

schemas/cluster.json

@@ -140,11 +140,12 @@
             "array",
             "null"
           ],
-          "default": null,
           "items": {
             "type": "string",
             "format": "ipv4"
-          }
+          },
+          "maxItems": 2,
+          "minItems": 2
         },
         "gateway": {
           "type": [
@@ -305,10 +306,8 @@
       "type": "object",
       "properties": {
         "advertiseRoutes": {
-          "type": [
-            "boolean",
-            "null"
-          ]
+          "type": "boolean",
+          "default": false
         },
         "authKey": {
           "anyOf": [

schemas/node.json

@@ -136,11 +136,12 @@
             "array",
             "null"
           ],
-          "default": null,
           "items": {
             "type": "string",
             "format": "ipv4"
-          }
+          },
+          "maxItems": 2,
+          "minItems": 2
         },
         "gateway": {
           "type": [
@@ -210,10 +211,8 @@
       "type": "object",
       "properties": {
         "advertiseRoutes": {
-          "type": [
-            "boolean",
-            "null"
-          ]
+          "type": "boolean",
+          "default": false
         },
         "authKey": {
           "anyOf": [

src/environment.rs

@@ -1,8 +1,8 @@
 use std::net::Ipv4Addr;
 use std::ops::Deref;
 use std::path::{Path, PathBuf};
+use std::str::FromStr;
 
-use minijinja::value::ViaDeserialize;
 use minijinja::{AutoEscape, Environment, path_loader};
 use walkdir::WalkDir;
 
@@ -16,13 +16,6 @@ pub struct PathEnvironment<'a> {
     path: PathBuf,
 }
 
-fn apply_netmask(
-    ip: ViaDeserialize<Ipv4Addr>,
-    netmask: ViaDeserialize<Ipv4Addr>,
-) -> Result<String, minijinja::Error> {
-    Ok((*ip & *netmask).to_string())
-}
-
 impl<'a> PathEnvironment<'a> {
     pub fn new(path: &Path) -> Self {
         let mut env = Environment::new();
@@ -34,7 +27,10 @@ impl<'a> PathEnvironment<'a> {
         env.set_auto_escape_callback(|_| AutoEscape::None);
 
         // Add filters
-        env.add_filter("to_prefix", |netmask: ViaDeserialize<Ipv4Addr>| {
+        env.add_filter("to_prefix", |netmask: String| {
+            let netmask = Ipv4Addr::from_str(&netmask).map_err(|err| {
+                minijinja::Error::new(minijinja::ErrorKind::InvalidOperation, err.to_string())
+            })?;
             let mask = netmask.to_bits();
             let prefix = mask.leading_ones();
 
@@ -48,8 +44,6 @@ impl<'a> PathEnvironment<'a> {
             }
         });
 
-        env.add_function("apply_netmask", apply_netmask);
-
         // Helper function for getting the path to kubeconfig files
         env.add_filter("kubeconfig", move |names: Vec<String>| {
             names

src/node.rs

@@ -40,6 +40,8 @@ enum NodeArch {
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 struct Tailscale {
     auth_key: Secret,
+    #[serde(default)]
+    #[optional_skip_wrap]
     advertise_routes: bool,
     #[serde(default)]
     server: Option<String>,
@@ -53,8 +55,7 @@ struct Network {
     ip: Ipv4Addr,
     netmask: Ipv4Addr,
     gateway: Ipv4Addr,
-    #[serde(default)]
-    dns: Option<Vec<Ipv4Addr>>,
+    dns: [Ipv4Addr; 2],
     #[optional_rename(OptionalTailscale)]
     #[optional_wrap]
     tailscale: Tailscale,
@@ -129,13 +130,6 @@ impl Node {
         // Sadly we have to this manually
         // TODO: Find a better way of doing this
         let default = OptionalNodeDeserialize {
-            network: Some(OptionalNetwork {
-                tailscale: Some(OptionalTailscale {
-                    advertise_routes: Some(false),
-                    ..Default::default()
-                }),
-                ..Default::default()
-            }),
             patches: Some(OptionalPatches {
                 all: Some(vec![]),
                 control_plane: Some(vec![]),