Prepare 0.3.4 release

sebt3 · Mar 9, 2025 · 55d9b12 · 55d9b12
1 parent a29dc95
commit 55d9b12
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/agent/src/main.rs b/agent/src/main.rs
@@ -42,6 +42,7 @@ async fn main() {
             .write_style_or("LOG_STYLE", "auto"),
     );
     let args = Parameters::parse();
+    common::context::init_k8s();
     match &args.command {
         Commands::Version(args) => version::run(args).await.unwrap_or_else(|e| {
             tracing::error!("Version failed with: {e:}");

diff --git a/agent/src/tenant/backup.rs b/agent/src/tenant/backup.rs
@@ -50,7 +50,7 @@ pub struct Parameters {
         long = "agent-image",
         env = "AGENT_IMAGE",
         value_name = "AGENT_IMAGE",
-        default_value = "docker.io/sebt3/vynil-agent:0.3.3"
+        default_value = "docker.io/sebt3/vynil-agent:0.3.4"
     )]
     agent_image: String,
     /// version

diff --git a/agent/src/tenant/delete.rs b/agent/src/tenant/delete.rs
@@ -50,7 +50,7 @@ pub struct Parameters {
         long = "agent-image",
         env = "AGENT_IMAGE",
         value_name = "AGENT_IMAGE",
-        default_value = "docker.io/sebt3/vynil-agent:0.3.3"
+        default_value = "docker.io/sebt3/vynil-agent:0.3.4"
     )]
     agent_image: String,
     /// Configuration directory

diff --git a/agent/src/tenant/install.rs b/agent/src/tenant/install.rs
@@ -50,7 +50,7 @@ pub struct Parameters {
         long = "agent-image",
         env = "AGENT_IMAGE",
         value_name = "AGENT_IMAGE",
-        default_value = "docker.io/sebt3/vynil-agent:0.3.3"
+        default_value = "docker.io/sebt3/vynil-agent:0.3.4"
     )]
     agent_image: String,
     /// version

diff --git a/agent/src/tenant/reconfigure.rs b/agent/src/tenant/reconfigure.rs
@@ -50,7 +50,7 @@ pub struct Parameters {
         long = "agent-image",
         env = "AGENT_IMAGE",
         value_name = "AGENT_IMAGE",
-        default_value = "docker.io/sebt3/vynil-agent:0.3.3"
+        default_value = "docker.io/sebt3/vynil-agent:0.3.4"
     )]
     agent_image: String,
     /// version

diff --git a/agent/src/tenant/restore.rs b/agent/src/tenant/restore.rs
@@ -50,7 +50,7 @@ pub struct Parameters {
         long = "agent-image",
         env = "AGENT_IMAGE",
         value_name = "AGENT_IMAGE",
-        default_value = "docker.io/sebt3/vynil-agent:0.3.3"
+        default_value = "docker.io/sebt3/vynil-agent:0.3.4"
     )]
     agent_image: String,
     /// version

diff --git a/common/src/context.rs b/common/src/context.rs
@@ -5,7 +5,6 @@ use std::sync::Mutex;
 #[derive(Clone)]
 pub struct Context {
     pub client: Client,
-    pub reporter: Reporter,
 }
 
 pub enum VynilContext {
@@ -17,6 +16,7 @@ pub enum VynilContext {
 
 lazy_static::lazy_static! {
     pub static ref CONTEXT: Mutex<VynilContext> = Mutex::new(VynilContext::None);
+    pub static ref KUBERNETES: Mutex<Option<Context>> = Mutex::new(None);
 }
 pub fn set_tenant(i: TenantInstance) {
     *CONTEXT.lock().unwrap() = VynilContext::TenantInstance(i);
@@ -128,9 +128,23 @@ pub fn get_short_name() -> String {
     }
 }
 
+pub fn init_k8s() {
+    *KUBERNETES.lock().unwrap() = Some(Context {
+        client: tokio::task::block_in_place(|| {
+            tokio::runtime::Handle::current()
+                .block_on(async move { Client::try_default().await.expect("create client") })
+        }),
+    });
+}
+
 pub fn get_client() -> Client {
-    tokio::runtime::Handle::current()
-        .block_on(async move { Client::try_default().await.expect("create client") })
+    match (*KUBERNETES.lock().unwrap()).clone() {
+        Some(ctx) => ctx.client,
+        None => tokio::task::block_in_place(|| {
+            tokio::runtime::Handle::current()
+                .block_on(async move { Client::try_default().await.expect("create client") })
+        }),
+    }
 }
 pub async fn get_client_async() -> Client {
     Client::try_default().await.expect("create client")

diff --git a/common/src/passwordhandler.rs b/common/src/passwordhandler.rs
@@ -1,5 +1,5 @@
 use rand::{
-    distr::{Distribution, uniform::Uniform, weighted::WeightedIndex},
+    distr::{uniform::Uniform, weighted::WeightedIndex, Distribution},
     rng, RngCore,
 };
 
@@ -28,9 +28,7 @@ impl Default for Passwords {
 impl Passwords {
     #[must_use]
     pub fn new() -> Passwords {
-        Passwords {
-            rng: Box::new(rng()),
-        }
+        Passwords { rng: Box::new(rng()) }
     }
 
     pub fn generate(&mut self, length: i64, alpha: u32, numbers: u32, symbols: u32) -> String {
@@ -51,7 +49,7 @@ impl Passwords {
         let mut password = String::with_capacity(length as usize);
         for _ in 0..length {
             let selected_set = character_sets.get(weighted_dist.sample(&mut self.rng)).unwrap();
-            let dist_char = Uniform::new_inclusive(0,selected_set.len()).unwrap();
+            let dist_char = Uniform::new_inclusive(0, selected_set.len() - 1).unwrap();
             let index = dist_char.sample(&mut self.rng);
             password.push(selected_set[index]);
         }

diff --git a/operator/src/main.rs b/operator/src/main.rs
@@ -49,6 +49,7 @@ async fn main() -> Result<()> {
     // Initialize tracing
     tracing::subscriber::set_global_default(collector).unwrap();
 
+    common::context::init_k8s();
     // Start kubernetes controller
     let (manager, controller_jbs, controller_tnts, controller_stms) = Manager::new().await;
 

diff --git a/operator/src/manager.rs b/operator/src/manager.rs
@@ -12,7 +12,7 @@ use serde::Serialize;
 use serde_json::{json, Value};
 use std::{collections::BTreeMap, path::PathBuf, sync::Arc};
 use tokio::sync::RwLock;
-static DEFAULT_AGENT_IMAGE: &str = "docker.io/sebt3/vynil-agent:0.3.3";
+static DEFAULT_AGENT_IMAGE: &str = "docker.io/sebt3/vynil-agent:0.3.4";
 
 pub struct JukeCacheItem {
     pub pull_secret: Option<String>,