feat: use new do k8s module for tf devnet

BuildOnViction · May 13, 2019 · e7b850e · e7b850e
1 parent 3fe2d9d
commit e7b850e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/terraform/devnet/k8s.tf b/terraform/devnet/k8s.tf
diff --git a/terraform/devnet/main.tf b/terraform/devnet/main.tf
@@ -3,11 +3,27 @@ provider "digitalocean" {
 }
 
 provider "kubernetes" {
-  host = "${digitalocean_kubernetes_cluster.devnet.endpoint}"
+  host = "${module.kubernetes.endpoint}"
 
-  client_certificate     = "${base64decode(digitalocean_kubernetes_cluster.devnet.kube_config.0.client_certificate)}"
-  client_key             = "${base64decode(digitalocean_kubernetes_cluster.devnet.kube_config.0.client_key)}"
-  cluster_ca_certificate = "${base64decode(digitalocean_kubernetes_cluster.devnet.kube_config.0.cluster_ca_certificate)}"
+  client_certificate     = "${module.kubernetes.client_certificate}"
+  client_key             = "${module.kubernetes.client_key}"
+  cluster_ca_certificate = "${module.kubernetes.cluster_ca_certificate}"
+}
+
+provider "helm" {
+    kubernetes {
+      host     = "${module.kubernetes.endpoint}"
+
+      client_certificate     = "${module.kubernetes.client_certificate}"
+      client_key             = "${module.kubernetes.client_key}"
+      cluster_ca_certificate = "${module.kubernetes.cluster_ca_certificate}"
+    }
+}
+
+module "kubernetes" {
+  source = "../modules/providers/digitalocean/kubernetes"
+
+  name = "devnet"
 }
 
 # module "tomomaster" {

diff --git a/terraform/devnet/variables.tf b/terraform/devnet/variables.tf
@@ -1,5 +1 @@
-variable "do_token" {}
-
-variable "region" {
-  default = "blr1"
-}
+variable "do_token" {}