Merge pull request #42 from kbst/fixtests

Testing and fixing for 0.2.0 release

Author: pst

aws/_modules/eks/cluster_services.tf

@@ -11,5 +11,10 @@ module "cluster_services" {
     cluster_name     = "${aws_eks_cluster.current.name}"
     cluster_endpoint = "${aws_eks_cluster.current.endpoint}"
     cluster_ca       = "${aws_eks_cluster.current.certificate_authority.0.data}"
+
+    # hack, because modules can't have depends_on
+    # prevent a race between kubernetes provider and cluster services/kustomize
+    # creating the namespace and the provider erroring out during apply
+    not_used = "${kubernetes_namespace.current.metadata.0.name}"
   }
 }

azurerm/_modules/aks/cluster_services.tf

@@ -15,5 +15,10 @@ module "cluster_services" {
     client_cert      = "${azurerm_kubernetes_cluster.current.kube_config.0.client_certificate}"
     client_key       = "${azurerm_kubernetes_cluster.current.kube_config.0.client_key}"
     path_cwd         = "${path.cwd}"
+
+    # hack, because modules can't have depends_on
+    # prevent a race between kubernetes provider and cluster services/kustomize
+    # creating the namespace and the provider erroring out during apply
+    not_used = "${kubernetes_namespace.current.metadata.0.name}"
   }
 }

google/_modules/gke/cluster_services.tf

@@ -12,5 +12,10 @@ module "cluster_services" {
     cluster_endpoint = "${google_container_cluster.current.endpoint}"
     cluster_ca       = "${google_container_cluster.current.master_auth.0.cluster_ca_certificate}"
     path_cwd         = "${path.cwd}"
+
+    # hack, because modules can't have depends_on
+    # prevent a race between kubernetes provider and cluster services/kustomize
+    # creating the namespace and the provider erroring out during apply
+    not_used = "${kubernetes_namespace.current.metadata.0.name}"
   }
 }

quickstart/src/configurations/aks/config.auto.tfvars

@@ -14,8 +14,8 @@ clusters = {
       # e.g. kbst-ops-eu-west-1.aws.infra.example.com
       base_domain = ""
 
-      # The Azure location to deploy the clusters in
-      location = ""
+      # The Azure resource group to use
+      resource_group = ""
     }
 
     # Settings for Ops-cluster

quickstart/src/manifests/overlays/aks/apps/README.md

@@ -0,0 +1,3 @@
+# AKS apps overlay
+
+Overlay for configuration specific to only apps AKS clusters.

quickstart/src/manifests/overlays/aks/apps/kustomization.yaml

@@ -0,0 +1,2 @@
+bases:
+- ../both               # inherit configuration specifc to AKS

quickstart/src/manifests/overlays/aks/both/README.md

@@ -0,0 +1,3 @@
+# AKS overlay
+
+Overlay for configuration shared across all AKS clusters.

quickstart/src/manifests/overlays/aks/both/kustomization.yaml

@@ -0,0 +1,2 @@
+bases:
+- ../../common             # inherit configuration shared between all clouds

quickstart/src/manifests/overlays/aks/ops/README.md

@@ -0,0 +1,3 @@
+# AKS ops overlay
+
+Overlay for configuration specific to only ops AKS clusters.

quickstart/src/manifests/overlays/aks/ops/kustomization.yaml

@@ -0,0 +1,2 @@
+bases:
+- ../both              # inherit configuration specifc to AKS