kubernetes namesaces, closes #667

magneticio · Jan 16, 2017 · c74466e · c74466e
1 parent 30f0cd1
commit c74466e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 7 deletions.
diff --git a/bootstrap/src/main/resources/reference.conf b/bootstrap/src/main/resources/reference.conf
@@ -68,6 +68,7 @@ vamp {
 
     kubernetes {
       url = ""
+      namespace = "default"
       workflow-name-prefix = "vamp-workflow-"
       service-type = "NodePort" # NodePort or LoadBalancer
       create-services = true

diff --git a/...driver/src/main/scala/io/vamp/container_driver/kubernetes/KubernetesContainerDriver.scala b/...driver/src/main/scala/io/vamp/container_driver/kubernetes/KubernetesContainerDriver.scala
@@ -10,6 +10,8 @@ trait KubernetesContainerDriver extends ContainerDriver {
 
   protected def apiUrl: String
 
+  protected def namespace: String
+
   protected def apiHeaders: List[(String, String)]
 
   protected val nameDelimiter = "-"

diff --git a/...ainer_driver/src/main/scala/io/vamp/container_driver/kubernetes/KubernetesDaemonSet.scala b/...ainer_driver/src/main/scala/io/vamp/container_driver/kubernetes/KubernetesDaemonSet.scala
@@ -8,7 +8,7 @@ import scala.concurrent.Future
 trait KubernetesDaemonSet extends KubernetesArtifact {
   this: KubernetesContainerDriver with ActorLogging ⇒
 
-  private lazy val url = s"$apiUrl/apis/extensions/v1beta1/namespaces/default/daemonsets"
+  private lazy val url = s"$apiUrl/apis/extensions/v1beta1/namespaces/$namespace/daemonsets"
 
   protected def createDaemonSet(ds: DaemonSet, labels: Map[String, String] = Map()): Future[Any] = {
     val request =

diff --git a/...iner_driver/src/main/scala/io/vamp/container_driver/kubernetes/KubernetesDeployment.scala b/...iner_driver/src/main/scala/io/vamp/container_driver/kubernetes/KubernetesDeployment.scala
@@ -15,11 +15,11 @@ trait KubernetesDeployment extends KubernetesArtifact {
 
   private val workflowIdLabel = "workflow"
 
-  private lazy val podUrl = s"$apiUrl/api/v1/namespaces/default/pods"
+  private lazy val podUrl = s"$apiUrl/api/v1/namespaces/$namespace/pods"
 
-  private lazy val replicaSetUrl = s"$apiUrl/apis/extensions/v1beta1/namespaces/default/replicasets"
+  private lazy val replicaSetUrl = s"$apiUrl/apis/extensions/v1beta1/namespaces/$namespace/replicasets"
 
-  private lazy val deploymentUrl = s"$apiUrl/apis/extensions/v1beta1/namespaces/default/deployments"
+  private lazy val deploymentUrl = s"$apiUrl/apis/extensions/v1beta1/namespaces/$namespace/deployments"
 
   override protected def supportedDeployableTypes = RktDeployable :: DockerDeployable :: Nil
 

diff --git a/...ner_driver/src/main/scala/io/vamp/container_driver/kubernetes/KubernetesDriverActor.scala b/...ner_driver/src/main/scala/io/vamp/container_driver/kubernetes/KubernetesDriverActor.scala
@@ -30,6 +30,8 @@ object KubernetesDriverActor {
 
   val url = Config.string(s"$config.url")
 
+  val namespace = Config.string(s"$config.namespace")
+
   val workflowNamePrefix = Config.string(s"$config.workflow-name-prefix")
 
   val token = Config.string(s"$config.token")
@@ -53,6 +55,8 @@ class KubernetesDriverActor extends ContainerDriverActor with KubernetesContaine
 
   protected val apiUrl = KubernetesDriverActor.url()
 
+  protected val namespace = KubernetesDriverActor.namespace()
+
   protected val apiHeaders = {
     def headers(bearer: String) = ("Authorization" → s"Bearer $bearer") :: HttpClient.jsonHeaders
 

diff --git a/container_driver/src/main/scala/io/vamp/container_driver/kubernetes/KubernetesService.scala b/container_driver/src/main/scala/io/vamp/container_driver/kubernetes/KubernetesService.scala
@@ -15,7 +15,7 @@ object KubernetesServiceType extends Enumeration {
 trait KubernetesService extends KubernetesArtifact {
   this: KubernetesContainerDriver with ActorLogging ⇒
 
-  private lazy val url = s"$apiUrl/api/v1/namespaces/default/services"
+  private lazy val url = s"$apiUrl/api/v1/namespaces/$namespace/services"
 
   private val nameMatcher = """^[a-z]([-a-z0-9]*[a-z0-9])?$""".r
 

diff --git a/persistence/src/main/scala/io/vamp/persistence/kv/ConsulStoreActor.scala b/persistence/src/main/scala/io/vamp/persistence/kv/ConsulStoreActor.scala
@@ -15,7 +15,7 @@ class ConsulStoreActorMapper extends ClassMapper {
 
 class ConsulStoreActor extends KeyValueStoreActor {
 
-  private val url = Config.string("vamp.persistence.key-value-store.consul.url")
+  private val url = Config.string("vamp.persistence.key-value-store.consul.url")()
 
   override protected def info(): Future[Any] = httpClient.get[Any](s"$url/v1/agent/self") map { consul ⇒
     Map("type" → "consul", "consul" → consul)

diff --git a/persistence/src/main/scala/io/vamp/persistence/kv/EtcdStoreActor.scala b/persistence/src/main/scala/io/vamp/persistence/kv/EtcdStoreActor.scala
@@ -17,7 +17,7 @@ class EtcdStoreActorMapper extends ClassMapper {
 
 class EtcdStoreActor extends KeyValueStoreActor {
 
-  private val url = Config.string("vamp.persistence.key-value-store.etcd.url")
+  private val url = Config.string("vamp.persistence.key-value-store.etcd.url")()
 
   private val valueNode = "value"