feat!: Added command to serve config files over tftp
This is a breaking change as the return type of cluster.nodes has changed, resulting in old templates potentially no longer working.
This commit is contained in:
+39
-7
@@ -7,10 +7,12 @@ use clap_complete::{Shell, generate as generate_complete};
|
||||
use crete::cluster::Cluster;
|
||||
use crete::environment::PathEnvironment;
|
||||
use crete::talosconfig::{get_current_context, set_context};
|
||||
use crete::{get_configs_path, get_repo_path, set_repo_path};
|
||||
use crete::tftp::ServerError;
|
||||
use crete::{get_configs_path, get_repo_path, set_repo_path, tftp};
|
||||
use futures::StreamExt;
|
||||
use futures::future::join_all;
|
||||
use minijinja::context;
|
||||
use regex::Regex;
|
||||
use thiserror::Error;
|
||||
|
||||
use crate::cli::{Cli, Commands, GlobalOpts};
|
||||
@@ -19,11 +21,11 @@ use crate::cli::{Cli, Commands, GlobalOpts};
|
||||
enum Error {
|
||||
#[error("No clusters where found")]
|
||||
NoClustersFound,
|
||||
#[error("Server error: {0}")]
|
||||
ServerError(#[from] ServerError),
|
||||
}
|
||||
|
||||
async fn generate(opts: &GlobalOpts) -> Result<(), Error> {
|
||||
set_repo_path(&opts.repo);
|
||||
|
||||
let clusters = Cluster::get_all().await;
|
||||
|
||||
if clusters.is_empty() {
|
||||
@@ -44,7 +46,7 @@ async fn generate(opts: &GlobalOpts) -> Result<(), Error> {
|
||||
|
||||
let content = template
|
||||
.render(context! {
|
||||
clusters,
|
||||
clusters => clusters.values().collect::<Vec<_>>(),
|
||||
root => opts.repo
|
||||
})
|
||||
.unwrap();
|
||||
@@ -62,8 +64,8 @@ async fn generate(opts: &GlobalOpts) -> Result<(), Error> {
|
||||
tokio::fs::create_dir_all(&path).await.unwrap();
|
||||
|
||||
// Generate config files
|
||||
join_all(clusters.iter().map(|cluster| async move {
|
||||
join_all(cluster.nodes().iter().map(|node| {
|
||||
join_all(clusters.values().map(|cluster| async move {
|
||||
join_all(cluster.nodes().map(|node| {
|
||||
let cluster = cluster.clone();
|
||||
async move {
|
||||
node.config_write(&cluster).await;
|
||||
@@ -79,7 +81,7 @@ async fn generate(opts: &GlobalOpts) -> Result<(), Error> {
|
||||
|
||||
// Merge all the cluster talosconfig files into a single file
|
||||
// Since this all modifies the same output file this has to happen sequentially
|
||||
for cluster in clusters {
|
||||
for (_, cluster) in clusters {
|
||||
cluster.talosconfig_merge().await;
|
||||
}
|
||||
|
||||
@@ -94,6 +96,8 @@ async fn generate(opts: &GlobalOpts) -> Result<(), Error> {
|
||||
async fn main() -> Result<(), Error> {
|
||||
let cli = Cli::parse();
|
||||
|
||||
set_repo_path(&cli.global_opts.repo);
|
||||
|
||||
match cli.command {
|
||||
Commands::Generate => generate(&cli.global_opts).await?,
|
||||
Commands::ShellCompletions => generate_complete(
|
||||
@@ -102,6 +106,34 @@ async fn main() -> Result<(), Error> {
|
||||
"crete",
|
||||
&mut std::io::stdout(),
|
||||
),
|
||||
Commands::Serve => {
|
||||
let re = Regex::new(r"talos/(?<cluster>.+)/(?<node>.+)\.ya?ml")
|
||||
.expect("regex should be valid");
|
||||
|
||||
tftp::serve(move |filename| {
|
||||
let filename = filename.to_owned();
|
||||
let re = re.clone();
|
||||
|
||||
async move {
|
||||
if let Some(caps) = re.captures(&filename) {
|
||||
let cluster = &caps["cluster"];
|
||||
let node = &caps["node"];
|
||||
|
||||
let clusters = Cluster::get_all().await;
|
||||
let cluster = clusters.get(cluster)?;
|
||||
|
||||
let node = cluster.node(node)?;
|
||||
|
||||
let config = node.config(cluster).await;
|
||||
|
||||
Some(config.into())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
})
|
||||
.await?
|
||||
}
|
||||
};
|
||||
|
||||
Ok(())
|
||||
|
||||
Reference in New Issue
Block a user