6 Commits

Author SHA1 Message Date
Dreaded_X 003b28a841 feat: Add function that applies netmask to ip
Committed / committed (pull_request) Successful in 46s
CI / prek (pull_request) Has been cancelled
CI / cargo shear (pull_request) Has been cancelled
2026-04-21 04:46:31 +02:00
Dreaded_X 108db75dc9 refactor: Use ViaDeserialize to convert ip address 2026-04-21 04:43:18 +02:00
Dreaded_X f7e4a2d545 feat: Make dns optional
Committed / committed (pull_request) Successful in 47s
CI / prek (pull_request) Successful in 6m31s
CI / cargo shear (pull_request) Successful in 7m58s
CI / cargo shear (push) Successful in 7m45s
Release-plz / Release-plz Release (push) Successful in 9m39s
CI / prek (push) Successful in 10m6s
Release-plz / Release-plz PR (push) Successful in 4m47s
2026-04-17 21:32:19 +02:00
Dreaded_X 7142ff0fa3 feat: Allow more than two dns entries 2026-04-17 20:59:42 +02:00
Release-plz afcca9eb47 chore(release): Release v0.1.1
Committed / committed (pull_request) Successful in 40s
CI / cargo shear (pull_request) Successful in 6m45s
CI / prek (pull_request) Successful in 10m0s
Release-plz / Release-plz PR (push) Successful in 5m31s
Release-plz / Release-plz Release (push) Successful in 6m13s
Audit / cargo audit (push) Successful in 7m3s
CI / cargo shear (push) Successful in 6m58s
CI / prek (push) Successful in 7m38s
Release / Arch Linux (push) Successful in 5m58s
Signed-off-by: Release-plz <release-plz@noreply.huizinga.dev>
2026-04-13 01:49:13 +00:00
Dreaded_X c76b0e6ade fix: No default value for advertise routes
Committed / committed (pull_request) Successful in 30s
CI / cargo shear (pull_request) Successful in 5m45s
CI / prek (pull_request) Successful in 5m50s
CI / cargo shear (push) Successful in 7m36s
Release-plz / Release-plz Release (push) Successful in 7m35s
CI / prek (push) Successful in 8m21s
Release-plz / Release-plz PR (push) Successful in 3m32s
2026-04-13 03:32:37 +02:00
7 changed files with 32 additions and 14 deletions
+6
View File
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
## [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
Generated
+1 -1
View File
@@ -214,7 +214,7 @@ dependencies = [
[[package]]
name = "crete"
version = "0.1.0"
version = "0.1.1"
dependencies = [
"clap",
"clap_complete",
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "crete"
version = "0.1.0"
version = "0.1.1"
edition = "2024"
default-run = "crete"
publish = ["infra"]
+2 -3
View File
@@ -140,12 +140,11 @@
"array",
"null"
],
"default": null,
"items": {
"type": "string",
"format": "ipv4"
},
"maxItems": 2,
"minItems": 2
}
},
"gateway": {
"type": [
+2 -3
View File
@@ -136,12 +136,11 @@
"array",
"null"
],
"default": null,
"items": {
"type": "string",
"format": "ipv4"
},
"maxItems": 2,
"minItems": 2
}
},
"gateway": {
"type": [
+11 -5
View File
@@ -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,6 +16,13 @@ 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();
@@ -27,10 +34,7 @@ impl<'a> PathEnvironment<'a> {
env.set_auto_escape_callback(|_| AutoEscape::None);
// Add filters
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())
})?;
env.add_filter("to_prefix", |netmask: ViaDeserialize<Ipv4Addr>| {
let mask = netmask.to_bits();
let prefix = mask.leading_ones();
@@ -44,6 +48,8 @@ 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
+9 -1
View File
@@ -53,7 +53,8 @@ struct Network {
ip: Ipv4Addr,
netmask: Ipv4Addr,
gateway: Ipv4Addr,
dns: [Ipv4Addr; 2],
#[serde(default)]
dns: Option<Vec<Ipv4Addr>>,
#[optional_rename(OptionalTailscale)]
#[optional_wrap]
tailscale: Tailscale,
@@ -128,6 +129,13 @@ 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![]),