Update with Environnement

Author: EliXorZz

src/epsilon/server/instance_provider.rs

@@ -1,5 +1,6 @@
 use crate::k8s::label::Label;
 use crate::{EResult, Kube};
+use std::env;
 
 use crate::epsilon::epsilon_error::EpsilonError;
 use crate::epsilon::server::instance::{Instance, InstanceJson};
@@ -87,7 +88,8 @@ impl InstanceProvider {
 
     pub async fn get_template_host(&self, route: &str) -> String {
         format!(
-            "http://epsilon-template.epsilon.svc.cluster.local:8000/{}",
+            "http://{}:8000/{}",
+            env::var("HOST_TEMPLATE").unwrap(),
             route
         )
     }

src/k8s/kube.rs

@@ -1,4 +1,5 @@
 use crate::k8s::label::Label;
+use std::env;
 
 use k8s_openapi::api::core::v1::Pod;
 use k8s_openapi::apimachinery::pkg::version::Info;
@@ -74,8 +75,13 @@ impl Kube {
                 "restartPolicy": "Never",
                 "containers": [{
                     "name": "main",
-                    "image": format!("{}/{}", "docker-registry.epsilon.svc.cluster.local:30000", template),
+                    "image": format!("{}/{}", env::var("HOST_REGISTRY").unwrap(), template),
                     "imagePullPolicy": "Always",
+                    "envFrom": [{
+                        "configMapRef": {
+                            "name": "epsilon-configuration"
+                        }
+                    }],
                     "ports": [
                         {
                             "containerPort": port,

src/main.rs

@@ -15,6 +15,7 @@ use crate::tasks::task_builder::TaskBuilder;
 use env_logger::fmt::Color;
 use k8s_openapi::chrono::Local;
 use log::{Level, LevelFilter};
+use std::env;
 use std::io::Write;
 use std::sync::Arc;
 
@@ -72,7 +73,11 @@ async fn main() -> EResult<()> {
 
     println!("{}", epsilon.replace("{}", env!("CARGO_PKG_VERSION")));
 
-    let kube = Kube::new("epsilon").await;
+    let namespace = env::var("KUBE_NAMESPACE").unwrap();
+
+    info!("Kube listen in namespace: {}", namespace);
+
+    let kube = Kube::new(&namespace).await;
 
     info!(
         "Kube client has been started (Namespace={}, Version={})",