I think we're good!

cluster-provisioning/terraform/flux.tf

@@ -25,10 +25,6 @@ resource "kubernetes_service_account" "flux" {
 
     labels = local.labels
     }
-  }
-
-  automount_service_account_token = true
-
   depends_on = ["kubernetes_namespace.flux"]
 }
 
@@ -36,7 +32,7 @@ resource "kubernetes_cluster_role" "flux" {
   metadata {
     name = "flux"
 
-    labels {
+    labels = {
       name = "flux"
     }
   }
@@ -59,7 +55,7 @@ resource "kubernetes_cluster_role_binding" "flux" {
   metadata {
     name = "flux"
 
-    labels {
+    labels = {
       name = "flux"
     }
   }
@@ -92,7 +88,7 @@ resource "kubernetes_deployment" "flux" {
 
   spec {
     selector {
-      match_labels {
+      match_labels = {
         name = "flux"
       }
     }
@@ -103,7 +99,7 @@ resource "kubernetes_deployment" "flux" {
 
     template {
       metadata {
-        labels {
+        labels = {
           name = "flux"
         }
       }
@@ -187,14 +183,14 @@ resource "kubernetes_deployment" "memcached" {
 
   spec {
     selector {
-      match_labels {
+      match_labels = {
         name = "memcached"
       }
     }
 
     template {
       metadata {
-        labels {
+        labels = {
           name = "memcached"
         }
       }
@@ -228,7 +224,7 @@ resource "kubernetes_service" "memcached" {
       port = 11211
     }
 
-    selector {
+    selector = {
       name = "memcached"
     }
   }

cluster-provisioning/terraform/variables.tf

@@ -76,14 +76,10 @@ variable "network_policy" {
   description = "Uses calico by default for network policy"
 }
 
-<<<<<<< HEAD
 variable "azure_subnet_id" {
   default = "/subscriptions/xxxxxx-xxxxxx-xxxx/resourceGroups/tf-sg/providers/Microsoft.Network/virtualNetworks/tfsg/subnets/cluster"
   description = "Subnet ID for virtual network where aks will be deployed"
 }
-=======
-
->>>>>>> parent of a9e25c3... this might work
 variable "pod_cidr" {
   default = "172.23.0.0/16"
   description = "Only use if kubenet is assigned as the network plugin. It will be divided into a /24 for each node and will be the space assigned for POD IPs on each node. A Rout Table will be created by Azure, but it must be assigned to the AKS subnet upon completion of deployment to complete install"