Merge pull request #12 from sjmiller609/master

fix helm installation of astronomer

astronomer.tf

@@ -1,27 +1,38 @@
 resource "null_resource" "helm_repo" {
   provisioner "local-exec" {
     command = <<EOF
+    set -xe
+    cd ${path.root}
     if [ ! -d ./helm.astronomer.io ]; then
       git clone https://github.com/astronomer/helm.astronomer.io.git
+      cd helm.astronomer.io
+      git checkout v${var.astronomer_version}
+      cd ..
+    fi
+    cd ${path.root}/helm.astronomer.io
+    VERSION=$(git rev-parse --abbrev-ref HEAD)
+    if [ ! $VERSION -eq v${var.astronomer_version} ]; then
+      cd ..
+      if [ ! -d ./backups ]; then
+        mkdir backups
+      fi
+      mv helm.astronomer.io backups/helm.astronomer.io.$VERSION.${timestamp()}
+      git clone https://github.com/astronomer/helm.astronomer.io.git
+      git checkout v${var.astronomer_version}
     fi
-    cd "./helm.astronomer.io" && \
-    git checkout ${var.astronomer_version}
     EOF
   }
 
-  provisioner "local-exec" {
-    when = "destroy"
-    command = "rm -rf './helm.astronomer.io'"
-  }
-
   triggers = {
     astronomer_version = var.astronomer_version
   }
 }
 
 # this is for development use
 resource "helm_release" "astronomer_local" {
-  depends_on = ["null_resource.helm_repo"]
+  depends_on = [null_resource.helm_repo,
+                kubernetes_secret.astronomer_bootstrap,
+                kubernetes_secret.astronomer_tls]
   name = "astronomer"
   version = var.astronomer_version
   chart = "./helm.astronomer.io"

variables.tf

@@ -32,7 +32,8 @@ variable "local_umbrella_chart" {
 }
 
 variable "astronomer_version" {
-  default = "v0.9.1-alpha.4"
+  description = "verison of helm chart to use, do not include a 'v' at the front"
+  default = "0.9.2"
   type    = string
 }