Organize modules by platform and OS distribution

google-cloud/container-linux/controllers/controllers.tf

@@ -16,9 +16,9 @@ resource "google_compute_instance_group_manager" "controllers" {
   ]
 }
 
-# bootkube-controller Container Linux config
+# Controller Container Linux Config
 data "template_file" "controller_config" {
-  template = "${file("${path.module}/cl/bootkube-controller.yaml.tmpl")}"
+  template = "${file("${path.module}/cl/controller.yaml.tmpl")}"
 
   vars = {
     k8s_dns_service_ip      = "${cidrhost(var.service_cidr, 10)}"
@@ -38,7 +38,7 @@ data "ct_config" "controller_ign" {
 
 resource "google_compute_instance_template" "controller" {
   name_prefix  = "${var.cluster_name}-controller-"
-  description  = "bootkube-controller Instance template"
+  description  = "Controller Instance template"
   machine_type = "${var.machine_type}"
 
   metadata {

google-cloud/container-linux/kubernetes/cluster.tf

@@ -1,5 +1,5 @@
 module "controllers" {
-  source             = "../gce-bootkube-controller"
+  source             = "../controllers"
   cluster_name       = "${var.cluster_name}"
   ssh_authorized_key = "${var.ssh_authorized_key}"
 
@@ -23,7 +23,7 @@ module "controllers" {
 }
 
 module "workers" {
-  source             = "../gce-bootkube-worker"
+  source             = "../workers"
   cluster_name       = "${var.cluster_name}"
   ssh_authorized_key = "${var.ssh_authorized_key}"
 

google-cloud/container-linux/workers/workers.tf

@@ -16,9 +16,9 @@ resource "google_compute_instance_group_manager" "workers" {
   ]
 }
 
-# bootkube-worker Container Linux config
+# Worker Container Linux Config
 data "template_file" "worker_config" {
-  template = "${file("${path.module}/cl/bootkube-worker.yaml.tmpl")}"
+  template = "${file("${path.module}/cl/worker.yaml.tmpl")}"
 
   vars = {
     k8s_dns_service_ip      = "${cidrhost(var.service_cidr, 10)}"
@@ -38,7 +38,7 @@ data "ct_config" "worker_ign" {
 
 resource "google_compute_instance_template" "worker" {
   name_prefix  = "${var.cluster_name}-worker-"
-  description  = "bootkube-worker Instance template"
+  description  = "Worker Instance template"
   machine_type = "${var.machine_type}"
 
   metadata {