platform/gcp: namespacing resources by cluster_name

modules/dns/gcp/records.tf

@@ -15,24 +15,6 @@ resource "google_dns_record_set" "ingress-external" {
 }
 
 # Etcd
-resource "google_dns_record_set" "etcd_srv_discover" {
-  count        = "${var.etcd_dns_enabled ? 1 : 0}"
-  name         = "${var.tls_enabled ? "_etcd-server-ssl._tcp.${var.base_domain}" : "_etcd-server._tcp.${var.base_domain}"}."
-  type         = "SRV"
-  managed_zone = "${var.managed_zone_name}"
-  rrdatas      = ["${formatlist("0 0 2380 %s", google_dns_record_set.etc_a_node.*.name)}"]
-  ttl          = "300"
-}
-
-resource "google_dns_record_set" "etcd_srv_client" {
-  count        = "${var.etcd_dns_enabled ? 1 : 0}"
-  name         = "${var.tls_enabled ? "_etcd-client-ssl._tcp.${var.base_domain}" : "_etcd-client._tcp.${var.base_domain}"}."
-  type         = "SRV"
-  managed_zone = "${var.managed_zone_name}"
-  rrdatas      = ["${formatlist("0 0 2379 %s", google_dns_record_set.etc_a_node.*.name)}"]
-  ttl          = "60"
-}
-
 resource "google_dns_record_set" "etc_a_node" {
   count        = "${var.etcd_dns_enabled ? var.etcd_instance_count : 0}"
   type         = "A"

modules/gcp/etcd/ignition.tf

@@ -3,7 +3,7 @@ data "ignition_config" "etcd" {
 
   systemd = [
     "${data.ignition_systemd_unit.locksmithd.*.id[count.index]}",
-    "${data.ignition_systemd_unit.etcd3.*.id[count.index]}",
+    "${var.ign_etcd_dropin_id_list[count.index]}",
   ]
 
   files = [
@@ -144,33 +144,3 @@ EOF
     },
   ]
 }
-
-data "ignition_systemd_unit" "etcd3" {
-  count  = "${length(var.external_endpoints) == 0 ? var.instance_count : 0}"
-  name   = "etcd-member.service"
-  enable = true
-
-  dropin = [
-    {
-      name = "40-etcd-cluster.conf"
-
-      content = <<EOF
-[Service]
-Environment="ETCD_IMAGE=${var.container_image}"
-Environment="RKT_RUN_ARGS=--volume etcd-ssl,kind=host,source=/etc/ssl/etcd \
-  --mount volume=etcd-ssl,target=/etc/ssl/etcd"
-ExecStart=
-ExecStart=/usr/lib/coreos/etcd-wrapper \
-  --name=etcd \
-  --discovery-srv=${var.base_domain} \
-  --advertise-client-urls=${var.tls_enabled ? "https" : "http"}://${var.cluster_name}-etcd-${count.index}.${var.base_domain}:2379 \
-  ${var.tls_enabled
-    ? "--cert-file=/etc/ssl/etcd/server.crt --key-file=/etc/ssl/etcd/server.key --peer-cert-file=/etc/ssl/etcd/peer.crt --peer-key-file=/etc/ssl/etcd/peer.key --peer-trusted-ca-file=/etc/ssl/etcd/ca.crt --peer-client-cert-auth=true"
-    : ""} \
-  --initial-advertise-peer-urls=${var.tls_enabled ? "https" : "http"}://${var.cluster_name}-etcd-${count.index}.${var.base_domain}:2380 \
-  --listen-client-urls=${var.tls_enabled ? "https" : "http"}://0.0.0.0:2379 \
-  --listen-peer-urls=${var.tls_enabled ? "https" : "http"}://0.0.0.0:2380
-EOF
-    },
-  ]
-}

modules/gcp/etcd/variables.tf

@@ -95,3 +95,7 @@ variable "tls_peer_key_pem" {
 variable "tls_peer_crt_pem" {
   default = ""
 }
+
+variable "ign_etcd_dropin_id_list" {
+  type = "list"
+}

modules/gcp/master-igm/master.tf

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-resource "google_compute_instance_template" "tectonic-master-it" {
-  name           = "tectonic-master-it"
+resource "google_compute_instance_template" "master-it" {
+  name           = "${var.cluster_name}-master-it"
   region         = "${var.region}"
   machine_type   = "${var.machine_type}"
   can_ip_forward = false
@@ -46,12 +46,12 @@ resource "google_compute_instance_template" "tectonic-master-it" {
   }
 }
 
-resource "google_compute_instance_group_manager" "tectonic-master-igm" {
+resource "google_compute_instance_group_manager" "master-igm" {
   count              = "${var.instance_count}"
   target_size        = 1
-  name               = "tectonic-master-igm-${count.index}"
+  name               = "${var.cluster_name}-master-igm-${count.index}"
   zone               = "${element(var.zone_list, count.index)}"
-  instance_template  = "${google_compute_instance_template.tectonic-master-it.self_link}"
+  instance_template  = "${google_compute_instance_template.master-it.self_link}"
   target_pools       = ["${var.master_targetpool_self_link}"]
   base_instance_name = "mstr"
 }

modules/gcp/master-igm/outputs.tf

@@ -15,5 +15,5 @@ limitations under the License.
 */
 
 output "instance_group" {
-  value = ["${google_compute_instance_group_manager.tectonic-master-igm.*.instance_group}"]
+  value = ["${google_compute_instance_group_manager.master-igm.*.instance_group}"]
 }

modules/gcp/network/firewall-etcd.tf

@@ -1,6 +1,6 @@
 resource "google_compute_firewall" "etcd-ingress" {
-  name    = "etcd-ingress"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-etcd-ingress"
+  network = "${google_compute_network.network.name}"
 
   # ICMP
   allow {
@@ -17,8 +17,8 @@ resource "google_compute_firewall" "etcd-ingress" {
 }
 
 resource "google_compute_firewall" "etcd" {
-  name    = "etcd"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-etcd"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"

modules/gcp/network/firewall-master.tf

@@ -1,6 +1,6 @@
 resource "google_compute_firewall" "master-ingress" {
-  name    = "master-ingress"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-master-ingress"
+  network = "${google_compute_network.network.name}"
 
   # ICMP
   allow {
@@ -17,8 +17,8 @@ resource "google_compute_firewall" "master-ingress" {
 }
 
 resource "google_compute_firewall" "master-ingress-heapster" {
-  name    = "master-ingress-heapster"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-master-ingress-heapster"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"
@@ -30,8 +30,8 @@ resource "google_compute_firewall" "master-ingress-heapster" {
 }
 
 resource "google_compute_firewall" "master-ingress-flannel" {
-  name    = "master-ingress-flannel"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-master-ingress-flannel"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "udp"
@@ -43,8 +43,8 @@ resource "google_compute_firewall" "master-ingress-flannel" {
 }
 
 resource "google_compute_firewall" "master-ingress-node-exporter" {
-  name    = "master-ingress-node-exporter"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-master-ingress-node-exporter"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"
@@ -56,8 +56,8 @@ resource "google_compute_firewall" "master-ingress-node-exporter" {
 }
 
 resource "google_compute_firewall" "master-ingress-kubelet" {
-  name    = "master-ingress-kubelet"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-master-ingress-kubelet"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"
@@ -69,8 +69,8 @@ resource "google_compute_firewall" "master-ingress-kubelet" {
 }
 
 resource "google_compute_firewall" "master-ingress-etcd" {
-  name    = "master-ingress-etcd"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-master-ingress-etcd"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"
@@ -82,8 +82,8 @@ resource "google_compute_firewall" "master-ingress-etcd" {
 }
 
 resource "google_compute_firewall" "master-ingress-services" {
-  name    = "master-ingress-services"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-master-ingress-services"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"

modules/gcp/network/firewall-worker.tf

@@ -1,6 +1,6 @@
 resource "google_compute_firewall" "worker-ingress" {
-  name    = "worker-ingress"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-worker-ingress"
+  network = "${google_compute_network.network.name}"
 
   # ICMP
   allow {
@@ -17,8 +17,8 @@ resource "google_compute_firewall" "worker-ingress" {
 }
 
 resource "google_compute_firewall" "worker-ingress-heapster" {
-  name    = "worker-ingress-heapster"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-worker-ingress-heapster"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"
@@ -30,8 +30,8 @@ resource "google_compute_firewall" "worker-ingress-heapster" {
 }
 
 resource "google_compute_firewall" "worker-ingress-flannel" {
-  name    = "worker-ingress-flannel"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-worker-ingress-flannel"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "udp"
@@ -43,8 +43,8 @@ resource "google_compute_firewall" "worker-ingress-flannel" {
 }
 
 resource "google_compute_firewall" "worker-ingress-node-exporter" {
-  name    = "worker-ingress-node-exporter"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-worker-ingress-node-exporter"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"
@@ -56,8 +56,8 @@ resource "google_compute_firewall" "worker-ingress-node-exporter" {
 }
 
 resource "google_compute_firewall" "worker-ingress-kubelet" {
-  name    = "worker-ingress-kubelet"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-worker-ingress-kubelet"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"
@@ -69,8 +69,8 @@ resource "google_compute_firewall" "worker-ingress-kubelet" {
 }
 
 resource "google_compute_firewall" "worker-ingress-services" {
-  name    = "worker-ingress-services"
-  network = "${google_compute_network.tectonic-network.name}"
+  name    = "${var.cluster_name}-worker-ingress-services"
+  network = "${google_compute_network.network.name}"
 
   allow {
     protocol = "tcp"

modules/gcp/network/loadbalancer.tf

@@ -1,42 +1,54 @@
-resource "google_compute_target_pool" "tectonic-master-targetpool" {
-  name = "tectonic-master-targetpool"
+resource "google_compute_target_pool" "master-targetpool" {
+  name = "${var.cluster_name}-master-targetpool"
 }
 
-resource "google_compute_target_pool" "tectonic-worker-targetpool" {
-  name = "tectonic-worker-targetpool"
+resource "google_compute_target_pool" "worker-targetpool" {
+  name = "${var.cluster_name}-worker-targetpool"
+
+  health_checks = [
+    "${google_compute_http_health_check.worker-hc.name}",
+  ]
+}
+
+resource "google_compute_http_health_check" "worker-hc" {
+  name         = "${var.cluster_name}-worker-hc"
+  request_path = "/"
+
+  timeout_sec        = 1
+  check_interval_sec = 1
 }
 
-resource "google_compute_address" "tectonic-masters-ip" {
-  name = "tectonic-masters-ip"
+resource "google_compute_address" "masters-ip" {
+  name = "${var.cluster_name}-masters-ip"
 }
 
-resource "google_compute_forwarding_rule" "tectonic-api-external-fwd-rule" {
+resource "google_compute_forwarding_rule" "api-external-fwd-rule" {
   load_balancing_scheme = "EXTERNAL"
-  name                  = "tectonic-api-external-fwd-rule"
-  ip_address            = "${google_compute_address.tectonic-masters-ip.address}"
+  name                  = "${var.cluster_name}-api-external-fwd-rule"
+  ip_address            = "${google_compute_address.masters-ip.address}"
   region                = "${var.gcp_region}"
-  target                = "${google_compute_target_pool.tectonic-master-targetpool.self_link}"
+  target                = "${google_compute_target_pool.master-targetpool.self_link}"
   port_range            = "443"
 }
 
-resource "google_compute_address" "tectonic-ingress-ip" {
-  name = "tectonic-ingress-ip"
+resource "google_compute_address" "ingress-ip" {
+  name = "${var.cluster_name}-ingress-ip"
 }
 
-resource "google_compute_forwarding_rule" "tectonic-ingress-external-http-fwd-rule" {
+resource "google_compute_forwarding_rule" "ingress-external-http-fwd-rule" {
   load_balancing_scheme = "EXTERNAL"
-  name                  = "tectonic-ingress-external-http-fwd-rule"
-  ip_address            = "${google_compute_address.tectonic-ingress-ip.address}"
+  name                  = "${var.cluster_name}-ingress-external-http-fwd-rule"
+  ip_address            = "${google_compute_address.ingress-ip.address}"
   region                = "${var.gcp_region}"
-  target                = "${google_compute_target_pool.tectonic-worker-targetpool.self_link}"
+  target                = "${google_compute_target_pool.worker-targetpool.self_link}"
   port_range            = "80"
 }
 
-resource "google_compute_forwarding_rule" "tectonic-ingress-external-https-fwd-rule" {
+resource "google_compute_forwarding_rule" "ingress-external-https-fwd-rule" {
   load_balancing_scheme = "EXTERNAL"
-  name                  = "tectonic-ingress-external-https-fwd-rule"
-  ip_address            = "${google_compute_address.tectonic-ingress-ip.address}"
+  name                  = "${var.cluster_name}-ingress-external-https-fwd-rule"
+  ip_address            = "${google_compute_address.ingress-ip.address}"
   region                = "${var.gcp_region}"
-  target                = "${google_compute_target_pool.tectonic-worker-targetpool.self_link}"
+  target                = "${google_compute_target_pool.worker-targetpool.self_link}"
   port_range            = "443"
 }

modules/gcp/network/network.tf

@@ -15,22 +15,22 @@ limitations under the License.
 */
 
 ## A single GCP network
-resource "google_compute_network" "tectonic-network" {
-  name                    = "tectonic-network"
+resource "google_compute_network" "network" {
+  name                    = "${var.cluster_name}-network"
   auto_create_subnetworks = "false"
 }
 
 ## Two subnetworks (masters, workers)
-resource "google_compute_subnetwork" "tectonic-master-subnet" {
-  name          = "tectonic-master-subnet"
+resource "google_compute_subnetwork" "master-subnet" {
+  name          = "${var.cluster_name}-master-subnet"
   ip_cidr_range = "${var.master_ip_cidr_range}"
-  network       = "${google_compute_network.tectonic-network.self_link}"
+  network       = "${google_compute_network.network.self_link}"
   region        = "${var.gcp_region}"
 }
 
-resource "google_compute_subnetwork" "tectonic-worker-subnet" {
-  name          = "tectonic-worker-subnet"
+resource "google_compute_subnetwork" "worker-subnet" {
+  name          = "${var.cluster_name}-worker-subnet"
   ip_cidr_range = "${var.worker_ip_cidr_range}"
-  network       = "${google_compute_network.tectonic-network.self_link}"
+  network       = "${google_compute_network.network.self_link}"
   region        = "${var.gcp_region}"
 }