Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
dd62f3d715
|
|||
|
42857e7d8c
|
|||
|
bd7ebf2e42
|
|||
|
71ad06757c
|
|||
|
589e1e31ec
|
|||
|
7c4b34cf9a
|
|||
|
66373c0636
|
@@ -7,10 +7,6 @@ on:
|
||||
- "*"
|
||||
pull_request:
|
||||
|
||||
concurrency:
|
||||
group: "${{ github.workflow }}-${{ github.ref }}"
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
prek:
|
||||
name: prek
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
name: Committed
|
||||
on:
|
||||
pull_request:
|
||||
|
||||
concurrency:
|
||||
group: "${{ github.workflow }}-${{ github.ref }}"
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
committed:
|
||||
name: committed
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- uses: crate-ci/committed@master
|
||||
with:
|
||||
commits: "origin/${{ gitea.base_ref }}..HEAD"
|
||||
@@ -32,11 +32,11 @@ jobs:
|
||||
run: |
|
||||
git config user.name "Release-plz"
|
||||
git config user.email "release-plz@noreply.huizinga.dev"
|
||||
git config url.https://${{ gitea.actor }}:${{ secrets.RELEASE_PLZ_TOKEN }}@git.huizinga.dev/.insteadOf https://git.huizinga.dev/
|
||||
git config url.https://${{ gitea.actor }}:${{ secrets.GITEA_TOKEN }}@git.huizinga.dev/.insteadOf https://git.huizinga.dev/
|
||||
- name: release-plz release
|
||||
env:
|
||||
CARGO_REGISTRIES_INFRA_TOKEN: "Bearer ${{ secrets.RELEASE_PLZ_TOKEN }}"
|
||||
run: release-plz release --git-token "${{ secrets.RELEASE_PLZ_TOKEN }}" --forge gitea
|
||||
CARGO_REGISTRIES_INFRA_TOKEN: "Bearer ${{ secrets.REGISTRY_TOKEN }}"
|
||||
run: release-plz release --git-token "${{ secrets.GITEA_TOKEN }}" --forge gitea --dry-run
|
||||
|
||||
release-plz-pr:
|
||||
name: Release-plz PR
|
||||
@@ -59,4 +59,4 @@ jobs:
|
||||
tool: release-plz
|
||||
- *git-setup
|
||||
- name: release-plz release-pr
|
||||
run: release-plz release-pr --git-token "${{ secrets.RELEASE_PLZ_TOKEN }}" --forge gitea
|
||||
run: release-plz release-pr --git-token "${{ secrets.GITEA_TOKEN }}" --forge gitea
|
||||
|
||||
@@ -18,8 +18,8 @@ jobs:
|
||||
uses: https://git.huizinga.dev/infra/archlinux-package-action@v4
|
||||
with:
|
||||
path: .
|
||||
- run: ls | grep -E 'crete-[0-9]+\.[0-9]+\.[0-9]+-[0-9]+-.*.pkg.tar.zst'
|
||||
- name: Upload package
|
||||
run: |
|
||||
curl --user ${{ gitea.actor }}:${{ secrets.REGISTRY_TOKEN }} \
|
||||
--upload-file "$(ls | grep -E 'crete-[0-9]+\.[0-9]+\.[0-9]+-[0-9]+-.*.pkg.tar.zst')" \
|
||||
run: curl --user ${{ gitea.actor }}:${{ secrets.GITEA_TOKEN }} \
|
||||
--upload-file="$(ls | grep -E 'crete-[0-9]+\.[0-9]+\.[0-9]+-[0-9]+-.*.pkg.tar.zst')" \
|
||||
https://git.huizinga.dev/api/packages/infra/arch/core
|
||||
|
||||
@@ -31,7 +31,6 @@ repos:
|
||||
rev: "1.0.0"
|
||||
hooks:
|
||||
- id: mdformat
|
||||
exclude: "^CHANGELOG.md$"
|
||||
|
||||
- repo: local
|
||||
hooks:
|
||||
|
||||
@@ -1,46 +1 @@
|
||||
# Changelog
|
||||
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [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
|
||||
|
||||
- _(package)_ Added PKGBUILD
|
||||
- Set user agent
|
||||
- _(performance)_ Disable request features to reduce binary size
|
||||
- Generate talos configs
|
||||
- Show error if no clusters are found in repo
|
||||
- Initial rewrite of python render tool
|
||||
|
||||
### <!-- 3 -->Refactor
|
||||
|
||||
- Big internal refactor
|
||||
|
||||
### <!-- 4 -->Testing
|
||||
|
||||
- Disable building tests
|
||||
|
||||
### <!-- 5 -->Miscellaneous Tasks
|
||||
|
||||
- _(actions)_ Publish Arch Linux package
|
||||
- _(license)_ Add GPL license
|
||||
- _(actions)_ Name steps
|
||||
- _(actions)_ Renamed release-plz workflow file
|
||||
- _(actions)_ Use committed to check pr commits
|
||||
- _(actions)_ Cancel in-progress ci runs when pushing to pr
|
||||
- _(docs)_ Added README
|
||||
- _(actions)_ Setup workflows
|
||||
- Publish to gitea registry
|
||||
- _(pre-commit)_ Update pre commit config
|
||||
|
||||
Generated
+1
-1
@@ -214,7 +214,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "crete"
|
||||
version = "0.1.1"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"clap_complete",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "crete"
|
||||
version = "0.1.1"
|
||||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
default-run = "crete"
|
||||
publish = ["infra"]
|
||||
|
||||
@@ -140,11 +140,12 @@
|
||||
"array",
|
||||
"null"
|
||||
],
|
||||
"default": null,
|
||||
"items": {
|
||||
"type": "string",
|
||||
"format": "ipv4"
|
||||
}
|
||||
},
|
||||
"maxItems": 2,
|
||||
"minItems": 2
|
||||
},
|
||||
"gateway": {
|
||||
"type": [
|
||||
|
||||
+3
-2
@@ -136,11 +136,12 @@
|
||||
"array",
|
||||
"null"
|
||||
],
|
||||
"default": null,
|
||||
"items": {
|
||||
"type": "string",
|
||||
"format": "ipv4"
|
||||
}
|
||||
},
|
||||
"maxItems": 2,
|
||||
"minItems": 2
|
||||
},
|
||||
"gateway": {
|
||||
"type": [
|
||||
|
||||
+5
-11
@@ -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
|
||||
|
||||
+1
-9
@@ -53,8 +53,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 +128,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![]),
|
||||
|
||||
+1
-9
@@ -11,15 +11,7 @@ where
|
||||
let path = get_talos_path().join("schematics").join(name);
|
||||
let content = std::fs::read_to_string(path).unwrap().trim().to_owned();
|
||||
|
||||
let client = reqwest::blocking::ClientBuilder::new()
|
||||
.user_agent(format!(
|
||||
"{}/{}",
|
||||
std::env!("CARGO_PKG_NAME"),
|
||||
std::env!("CARGO_PKG_VERSION")
|
||||
))
|
||||
.build()
|
||||
.unwrap();
|
||||
|
||||
let client = reqwest::blocking::Client::new();
|
||||
let res = client
|
||||
.post("https://factory.talos.dev/schematics")
|
||||
.body(content)
|
||||
|
||||
Reference in New Issue
Block a user