From ef2c02e83ae2578598a0585dbd522325c61a4065 Mon Sep 17 00:00:00 2001 From: alecmocatta Date: Tue, 15 Oct 2019 14:32:37 +0100 Subject: [PATCH] let kube get in-cluster default namespace given https://github.com/clux/kube-rs/pull/74 --- Cargo.toml | 2 +- src/bin/constellation/kube.rs | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5b12db9..12e447a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,7 +38,7 @@ crossbeam = "0.7" docopt = "1.0" either = "1.5" futures-preview = "0.3.0-alpha.18" -kube = { version = "0.16", features = ["openapi"], optional = true } +kube = { version = "0.16.2", features = ["openapi"], optional = true } log = "0.4" notifier = { version = "0.1", features = ["tcp_typed"] } once_cell = "1.0" diff --git a/src/bin/constellation/kube.rs b/src/bin/constellation/kube.rs index e17ce21..33f5651 100644 --- a/src/bin/constellation/kube.rs +++ b/src/bin/constellation/kube.rs @@ -5,7 +5,7 @@ use ::kube::{ }; use serde_json::json; use std::{ - collections::HashMap, env, fs::read_to_string, net::{IpAddr, SocketAddr}, thread + collections::HashMap, env, net::{IpAddr, SocketAddr}, thread }; use super::master; @@ -15,10 +15,8 @@ pub fn kube_master( master_bind: SocketAddr, fabric_port: u16, bridge_bind: SocketAddr, mem: u64, cpu: u32, replicas: u32, ) { - let namespace = - read_to_string("/var/run/secrets/kubernetes.io/serviceaccount/namespace").unwrap(); - let config = config::incluster_config().expect("failed to load in-cluster kubeconfig"); + let namespace = config.default_ns.clone(); let client = APIClient::new(config); let jobs = Api::v1ReplicaSet(client.clone()).within(&namespace); //.group("extensions").version("v1beta1");