Create argocd-namespace before applying 'secrets' folder

Author: dag-andersen

src/argocd.rs

@@ -10,6 +10,20 @@ pub struct ArgoCDOptions<'a> {
 
 const CONFIG_PATH: &str = "argocd-config";
 
+pub async fn create_namespace() -> Result<(), Box<dyn Error>> {
+
+    match run_command("kubectl create ns argocd", None).await {
+        Ok(_) => (),
+        Err(e) => {
+            error!("❌ Failed to create namespace argocd");
+            panic!("error: {}", String::from_utf8_lossy(&e.stderr))
+        }
+    }
+
+    debug!("🦑 Namespace argocd created successfully");
+    Ok(())
+}
+
 pub async fn install_argo_cd(options: ArgoCDOptions<'_>) -> Result<(), Box<dyn Error>> {
     info!(
         "🦑 Installing Argo CD Helm Chart version: '{}'",
@@ -37,15 +51,6 @@ pub async fn install_argo_cd(options: ArgoCDOptions<'_>) -> Result<(), Box<dyn E
         }
     };
 
-    // create namespace argocd
-    match run_command("kubectl create ns argocd", None).await {
-        Ok(_) => (),
-        Err(e) => {
-            error!("❌ Failed to create namespace argocd");
-            panic!("error: {}", String::from_utf8_lossy(&e.stderr))
-        }
-    }
-
     // add argo repo to helm
     match run_command(
         "helm repo add argo https://argoproj.github.io/argo-helm",

src/main.rs

@@ -348,11 +348,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
         ClusterTool::Minikube => minikube::create_cluster().await?,
     }
 
-    argocd::install_argo_cd(argocd::ArgoCDOptions {
-        version: argocd_version,
-        debug: opt.debug,
-    })
-    .await?;
+    argocd::create_namespace().await?;
 
     create_folder_if_not_exists(secrets_folder);
     match apply_folder(secrets_folder) {
@@ -364,6 +360,12 @@ async fn main() -> Result<(), Box<dyn Error>> {
         }
     }
 
+    argocd::install_argo_cd(argocd::ArgoCDOptions {
+        version: argocd_version,
+        debug: opt.debug,
+    })
+    .await?;
+
     fs::write(apps_file(&Branch::Base), applications_to_string(base_apps))?;
     fs::write(
         apps_file(&Branch::Target),