Merge pull request #5 from sailthru/upgrade-ambassador-tf12

Upgrade module to terraform 0.12

admin_service.tf

@@ -1,42 +1,34 @@
 resource "kubernetes_service" "this_admin" {
-  count = "${var.admin_service_enable  ? 1 : 0}"
+  count = var.admin_service_enable ? 1 : 0
 
-  metadata = [
-    {
-      annotations = "${var.admin_service_annotations}"
+  metadata {
+    annotations = var.admin_service_annotations
+    name        = "${var.name}-admin"
+    namespace   = var.namespace_name
+
+    labels = {
+      terrafrom = "true",
+      app       = var.name
+    }
+  }
+
+  spec {
+    type = var.admin_service_type
+
+    port {
       name        = "${var.name}-admin"
-      namespace   = "${var.namespace_name}"
-
-      labels {
-        terrafrom = "true"
-      }
-
-      labels {
-        app = "${var.name}"
-      }
-    },
-  ]
-
-  spec = [
-    {
-      type = "${var.admin_service_type}"
-
-      port = [
-        {
-          name        = "${var.name}-admin"
-          port        = 8877
-          protocol    = "TCP"
-          target_port = 8877
-        },
-      ]
-
-      selector {
-        app = "${var.name}"
-      }
-
-      session_affinity = "None"
-    },
-  ]
-
-  depends_on = ["kubernetes_namespace.this"]
+      port        = 8877
+      protocol    = "TCP"
+      target_port = 8877
+    }
+
+    selector = {
+      app = var.name
+    }
+
+    session_affinity = "None"
+  }
+
+  depends_on = [kubernetes_namespace.this]
 }
+

config.tf

@@ -1,20 +1,18 @@
 resource "kubernetes_config_map" "this" {
   metadata {
     name      = "${var.name}-config"
-    namespace = "${var.namespace_name}"
+    namespace = var.namespace_name
 
-    labels {
-      terrafrom = "true"
-    }
-
-    labels {
-      app = "${var.name}"
+    labels = {
+      terrafrom = "true",
+      app       = var.name
     }
   }
 
-  data {
-    exporterConfiguration = "${var.exporter_configuration}"
+  data = {
+    exporterConfiguration = var.exporter_configuration
   }
 
-  depends_on = ["kubernetes_namespace.this"]
+  depends_on = [kubernetes_namespace.this]
 }
+