0.2.10

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vynil"
-version = "0.2.9"
+version = "0.2.10"
 authors = ["Sébastien Huss <sebastien.huss@gmail.com>"]
 edition = "2021"
 license = "	BSD-3-Clause"

agent/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "agent"
-version = "0.2.9"
+version = "0.2.10"
 authors = ["Sébastien Huss <sebastien.huss@gmail.com>"]
 edition = "2021"
 license = "	BSD-3-Clause"

dist/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dist"
-version = "0.2.9"
+version = "0.2.10"
 authors = ["Sébastien Huss <sebastien.huss@gmail.com>"]
 edition = "2021"
 license = "	BSD-3-Clause"

dist/src/pack.rs

@@ -78,7 +78,8 @@ pub fn run(args:&Parameters) -> Result<()> {
     let dest_dir = fs::canonicalize(&tmp).unwrap();
 
     // Start the script engine
-    let mut script = script::Script::from_dir(&path.clone(), &"pack".to_string(), script::new_context(
+    let stage = "pack".to_string();
+    let mut script = script::Script::from_dir(&path.clone(), &stage, script::new_context(
         yaml.category.clone(),
         yaml.metadata.name.clone(),
         yaml.metadata.name.clone(),
@@ -87,13 +88,13 @@ pub fn run(args:&Parameters) -> Result<()> {
         &yaml.get_values(&serde_json::Map::new())
     ));
     // run the pre-pack stage if any
-    let stage = "pack".to_string();
     match script.run_pre_stage(&stage) {Ok(_) => {}, Err(e) => {return Err(e)}}
     // look source directory
     let mut copies: Vec<PathBuf> = Vec::new();
     let re_kusto = Regex::new(r"^kustomization\.yaml$").unwrap();
     let re_kustohbs = Regex::new(r"^kustomization\.yaml\.hbs$").unwrap();
     let re_rhai = Regex::new(r"\.rhai$").unwrap();
+    let re_pack = Regex::new(r"pack\.rhai$").unwrap();
     let re_hbs = Regex::new(r"\.hbs$").unwrap();
     let re_ymlhbs = Regex::new(r"\.yaml\.hbs$").unwrap();
     let re_yml = Regex::new(r"\.yaml$").unwrap();
@@ -123,7 +124,7 @@ pub fn run(args:&Parameters) -> Result<()> {
             use_templates = true;
             copies.push(path);
         } else if re_tf.is_match(filename) ||
-                (re_rhai.is_match(filename) && (script.have_stage("install") || script.have_stage("destroy") || script.have_stage("plan") || script.have_stage("template"))) {
+                (re_rhai.is_match(filename) && !re_pack.is_match(filename)) {
             copies.push(path);
         }
     }

k8s/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "k8s"
-version = "0.2.9"
+version = "0.2.10"
 edition = "2021"
 license = "	BSD-3-Clause"
 

operator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "operator"
-version = "0.2.9"
+version = "0.2.10"
 authors = ["Sébastien Huss <sebastien.huss@gmail.com>"]
 edition = "2021"
 default-run = "operator"

operator/src/install.rs

@@ -223,15 +223,15 @@ impl Reconciler for Install {
                     events::from_delete("Install", &name, "Job", &job.name_any(), Some(job.object_ref(&())))
                 ).await.map_err(Error::KubeError)?;
                 jobs.delete(agent_name.as_str()).await.unwrap();
-                error!("Recreating {agent_name} Job");
+                info!("Recreating {agent_name} Job");
                 recorder.publish(
                     events::from_create("Install", &name, "Job", &job.name_any(), Some(job.object_ref(&())))
                 ).await.map_err(Error::KubeError)?;
                 jobs.create_install(agent_name.as_str(), &agent_job, action, name.as_str(), ns.as_str()).await.unwrap()
             }};
             if let Some(status) = job.status {
                 if status.completion_time.is_none() {
-                    error!("Waiting after {agent_name} Job");
+                    info!("Waiting after {agent_name} Job");
                     recorder.publish(
                         events::from_check("Install", &name, "Bootstrap in progress, requeue".to_string(), None)
                     ).await.map_err(Error::KubeError)?;

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "package"
-version = "0.2.9"
+version = "0.2.10"
 authors = ["Sébastien Huss <sebastien.huss@gmail.com>"]
 edition = "2021"
 license = "	BSD-3-Clause"