Move all terraform setup to test/terraform

openbao · Aug 20, 2018 · 36e8afc · 36e8afc
1 parent 90ce7e6
commit 36e8afc
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 293 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 .terraform/
+.terraform.tfstate*
 terraform.tfstate*
 terraform.tfvars
 values.dev.yaml
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ be properly cleaned up. We recommend recycling the Kubernetes cluster to
 start from a clean slate.
 
 **Note:** There is a Terraform configuration in the
-[terraform/ directory](https://github.com/hashicorp/consul-k8s/tree/master/terraform)
+[test/terraform/ directory](https://github.com/hashicorp/consul-helm/tree/master/test/terraform)
 that can be used to quickly bring up a GKE cluster and configure
 `kubectl` and `helm` locally. This can be used to quickly spin up a test
 cluster.
diff --git a/terraform/README.md b/terraform/README.md
diff --git a/terraform/main.tf b/terraform/main.tf
diff --git a/terraform/modules/README.md b/terraform/modules/README.md
diff --git a/terraform/modules/gke/README.md b/terraform/modules/gke/README.md
diff --git a/terraform/modules/gke/main.tf b/terraform/modules/gke/main.tf
diff --git a/terraform/modules/gke/outputs.tf b/terraform/modules/gke/outputs.tf
diff --git a/terraform/modules/gke/variables.tf b/terraform/modules/gke/variables.tf
diff --git a/terraform/modules/helm/main.tf b/terraform/modules/helm/main.tf
diff --git a/terraform/modules/helm/variables.tf b/terraform/modules/helm/variables.tf
diff --git a/terraform/variables.tf b/terraform/variables.tf
diff --git a/test/scripts/cli-init.sh b/test/scripts/cli-init.sh
diff --git a/test/scripts/docker-init.sh b/test/scripts/docker-init.sh
diff --git a/test/terraform/main.tf b/test/terraform/main.tf
@@ -1,3 +1,7 @@
+locals {
+  service_account_path = "${path.module}/service-account.yaml"
+}
+
 provider "google" {
   project = "${var.project}"
 }
@@ -16,3 +20,47 @@ resource "google_container_cluster" "cluster" {
   node_version       = "${var.k8s_version}"
 }
 
+resource "null_resource" "kubectl" {
+  count = "${var.init_cli ? 1 : 0 }"
+
+  triggers {
+    cluster = "${google_container_cluster.cluster.id}"
+  }
+
+  # On creation, we want to setup the kubectl credentials. The easiest way
+  # to do this is to shell out to gcloud.
+  provisioner "local-exec" {
+    command = "gcloud container clusters get-credentials --zone=${var.zone} ${google_container_cluster.cluster.name}"
+  }
+
+  # On destroy we want to try to clean up the kubectl credentials. This
+  # might fail if the credentials are already cleaned up or something so we
+  # want this to continue on failure. Generally, this works just fine since
+  # it only operates on local data.
+  provisioner "local-exec" {
+    when       = "destroy"
+    on_failure = "continue"
+    command    = "kubectl config get-clusters | grep ${google_container_cluster.cluster.name} | xargs -n1 kubectl config delete-cluster"
+  }
+
+  provisioner "local-exec" {
+    when       = "destroy"
+    on_failure = "continue"
+    command    = "kubectl config get-contexts | grep ${google_container_cluster.cluster.name} | xargs -n1 kubectl config delete-context"
+  }
+}
+
+resource "null_resource" "helm" {
+  count = "${var.init_cli ? 1 : 0 }"
+
+  triggers {
+    cluster = "${google_container_cluster.cluster.id}"
+  }
+
+  provisioner "local-exec" {
+    command = <<EOF
+kubectl apply -f '${local.service_account_path}'
+helm init --service-account helm
+EOF
+  }
+}
diff --git a/terraform/modules/helm/service-account.yaml → test/terraform/service-account.yaml b/terraform/modules/helm/service-account.yaml → test/terraform/service-account.yaml
diff --git a/test/terraform/variables.tf b/test/terraform/variables.tf
@@ -15,3 +15,8 @@ variable "zone" {
   default     = "us-central1-a"
   description = "The zone to launch all the GKE nodes in."
 }
+
+variable "init_cli" {
+  default = false
+  description = "Whether to init the CLI tools kubectl, helm, etc. or not."
+}