From 795428329af653cc1adf576889e1c0afd6de5476 Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Wed, 27 Sep 2017 20:50:32 -0700
Subject: [PATCH] google-cloud: Move controller and worker submodules under
 kubernetes

---
 google-cloud/container-linux/kubernetes/cluster.tf            | 4 ++--
 .../{ => kubernetes}/controllers/cl/controller.yaml.tmpl      | 0
 .../{ => kubernetes}/controllers/controllers.tf               | 0
 .../container-linux/{ => kubernetes}/controllers/network.tf   | 0
 .../container-linux/{ => kubernetes}/controllers/variables.tf | 0
 .../{ => kubernetes}/workers/cl/worker.yaml.tmpl              | 0
 .../container-linux/{ => kubernetes}/workers/network.tf       | 0
 .../container-linux/{ => kubernetes}/workers/outputs.tf       | 0
 .../container-linux/{ => kubernetes}/workers/variables.tf     | 0
 .../container-linux/{ => kubernetes}/workers/workers.tf       | 0
 10 files changed, 2 insertions(+), 2 deletions(-)
 rename google-cloud/container-linux/{ => kubernetes}/controllers/cl/controller.yaml.tmpl (100%)
 rename google-cloud/container-linux/{ => kubernetes}/controllers/controllers.tf (100%)
 rename google-cloud/container-linux/{ => kubernetes}/controllers/network.tf (100%)
 rename google-cloud/container-linux/{ => kubernetes}/controllers/variables.tf (100%)
 rename google-cloud/container-linux/{ => kubernetes}/workers/cl/worker.yaml.tmpl (100%)
 rename google-cloud/container-linux/{ => kubernetes}/workers/network.tf (100%)
 rename google-cloud/container-linux/{ => kubernetes}/workers/outputs.tf (100%)
 rename google-cloud/container-linux/{ => kubernetes}/workers/variables.tf (100%)
 rename google-cloud/container-linux/{ => kubernetes}/workers/workers.tf (100%)

diff --git a/google-cloud/container-linux/kubernetes/cluster.tf b/google-cloud/container-linux/kubernetes/cluster.tf
index 6eb6e476..c47ebef4 100644
--- a/google-cloud/container-linux/kubernetes/cluster.tf
+++ b/google-cloud/container-linux/kubernetes/cluster.tf
@@ -1,5 +1,5 @@
 module "controllers" {
-  source             = "../controllers"
+  source             = "controllers"
   cluster_name       = "${var.cluster_name}"
   ssh_authorized_key = "${var.ssh_authorized_key}"
 
@@ -23,7 +23,7 @@ module "controllers" {
 }
 
 module "workers" {
-  source             = "../workers"
+  source             = "workers"
   cluster_name       = "${var.cluster_name}"
   ssh_authorized_key = "${var.ssh_authorized_key}"
 
diff --git a/google-cloud/container-linux/controllers/cl/controller.yaml.tmpl b/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl
similarity index 100%
rename from google-cloud/container-linux/controllers/cl/controller.yaml.tmpl
rename to google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl
diff --git a/google-cloud/container-linux/controllers/controllers.tf b/google-cloud/container-linux/kubernetes/controllers/controllers.tf
similarity index 100%
rename from google-cloud/container-linux/controllers/controllers.tf
rename to google-cloud/container-linux/kubernetes/controllers/controllers.tf
diff --git a/google-cloud/container-linux/controllers/network.tf b/google-cloud/container-linux/kubernetes/controllers/network.tf
similarity index 100%
rename from google-cloud/container-linux/controllers/network.tf
rename to google-cloud/container-linux/kubernetes/controllers/network.tf
diff --git a/google-cloud/container-linux/controllers/variables.tf b/google-cloud/container-linux/kubernetes/controllers/variables.tf
similarity index 100%
rename from google-cloud/container-linux/controllers/variables.tf
rename to google-cloud/container-linux/kubernetes/controllers/variables.tf
diff --git a/google-cloud/container-linux/workers/cl/worker.yaml.tmpl b/google-cloud/container-linux/kubernetes/workers/cl/worker.yaml.tmpl
similarity index 100%
rename from google-cloud/container-linux/workers/cl/worker.yaml.tmpl
rename to google-cloud/container-linux/kubernetes/workers/cl/worker.yaml.tmpl
diff --git a/google-cloud/container-linux/workers/network.tf b/google-cloud/container-linux/kubernetes/workers/network.tf
similarity index 100%
rename from google-cloud/container-linux/workers/network.tf
rename to google-cloud/container-linux/kubernetes/workers/network.tf
diff --git a/google-cloud/container-linux/workers/outputs.tf b/google-cloud/container-linux/kubernetes/workers/outputs.tf
similarity index 100%
rename from google-cloud/container-linux/workers/outputs.tf
rename to google-cloud/container-linux/kubernetes/workers/outputs.tf
diff --git a/google-cloud/container-linux/workers/variables.tf b/google-cloud/container-linux/kubernetes/workers/variables.tf
similarity index 100%
rename from google-cloud/container-linux/workers/variables.tf
rename to google-cloud/container-linux/kubernetes/workers/variables.tf
diff --git a/google-cloud/container-linux/workers/workers.tf b/google-cloud/container-linux/kubernetes/workers/workers.tf
similarity index 100%
rename from google-cloud/container-linux/workers/workers.tf
rename to google-cloud/container-linux/kubernetes/workers/workers.tf