Merge pull request #32 from utilitywarehouse/gce-provider

Alter ignition module to add gcd provider specific variables
utilitywarehouse · May 1, 2018 · 2630fae · 2630fae
2 parents d0c03f9 + c619468
commit 2630fae
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 8 deletions.
diff --git a/_data.tf b/_data.tf
@@ -4,5 +4,26 @@ variable "node_name_command" {
   default = {
     ""    = "hostname -f"
     "aws" = "curl -s http://169.254.169.254/latest/meta-data/local-hostname"
+    "gce" = "curl -s http://metadata.google.internal/computeMetadata/v1/instance/hostname -H Metadata-Flavor:Google"
+  }
+}
+
+variable "get_ip_command" {
+  type = "map"
+
+  default = {
+    ""    = ""
+    "aws" = "curl -s http://169.254.169.254/latest/meta-data/local-ipv4"
+    "gce" = "curl -s http://metadata.google.internal/computeMetadata/v1/instance/network-interfaces/0/ip -H Metadata-Flavor:Google"
+  }
+}
+
+variable "kubernetes_master_default_svc" {
+  type = "map"
+
+  default = {
+    ""    = "10.3.0.1"
+    "aws" = "10.3.0.1"
+    "gce" = "10.5.0.1"
   }
 }
diff --git a/cfssl.tf b/cfssl.tf
@@ -37,7 +37,12 @@ data "ignition_file" "cfssl-client-config" {
 }
 
 data "template_file" "cfssl-disk-formatter" {
-  template = "${file("${path.module}/resources/disk-formatter.service")}"
+  template = "${ var.cloud_provider == "aws" ? 
+	                 file("${path.module}/resources/aws-disk-formatter.service") 
+								:var.cloud_provider == "gce" ?
+								   file("${path.module}/resources/gce-disk-formatter.service")
+								:""
+							}"
 
   vars {
     volumeid   = "${var.cfssl_data_volumeid}"
@@ -53,7 +58,12 @@ data "ignition_systemd_unit" "cfssl-disk-formatter" {
 }
 
 data "template_file" "cfssl-disk-mounter" {
-  template = "${file("${path.module}/resources/disk-mounter.mount")}"
+  template = "${ var.cloud_provider == "aws" ?  
+									file("${path.module}/resources/aws-disk-mounter.mount")
+								:var.cloud_provider == "gce" ?
+									file("${path.module}/resources/gce-disk-mounter.mount")
+								:""
+							}"
 
   vars {
     volumeid       = "${var.cfssl_data_volumeid}"

diff --git a/etcd.tf b/etcd.tf
@@ -14,6 +14,7 @@ data "template_file" "etcd-cfssl-new-cert" {
     path    = "/etc/etcd/ssl"
     cn      = "${count.index}.etcd.${var.dns_domain}"
     org     = ""
+    get_ip  = "${var.get_ip_command[var.cloud_provider]}"
 
     extra_names = "${join(",", list(
       "etcd.${var.dns_domain}",
@@ -67,8 +68,14 @@ data "ignition_file" "etcdctl-wrapper" {
 }
 
 data "template_file" "disk-formatter" {
-  count    = "${length(var.etcd_data_volumeids)}"
-  template = "${file("${path.module}/resources/disk-formatter.service")}"
+  count = "${length(var.etcd_data_volumeids)}"
+
+  template = "${ var.cloud_provider == "aws" ? 
+	                 file("${path.module}/resources/aws-disk-formatter.service") 
+								:var.cloud_provider == "gce" ?
+								   file("${path.module}/resources/gce-disk-formatter.service")
+								:""
+							}"
 
   vars {
     volumeid   = "${var.etcd_data_volumeids[count.index]}"
@@ -85,8 +92,14 @@ data "ignition_systemd_unit" "disk-formatter" {
 }
 
 data "template_file" "disk-mounter" {
-  count    = "${length(var.etcd_data_volumeids)}"
-  template = "${file("${path.module}/resources/disk-mounter.mount")}"
+  count = "${length(var.etcd_data_volumeids)}"
+
+  template = "${ var.cloud_provider == "aws" ?  
+									file("${path.module}/resources/aws-disk-mounter.mount")
+								:var.cloud_provider == "gce" ?
+									file("${path.module}/resources/gce-disk-mounter.mount")
+								:""
+							}"
 
   vars {
     volumeid       = "${var.etcd_data_volumeids[count.index]}"

diff --git a/master.tf b/master.tf
@@ -13,9 +13,10 @@ data "template_file" "master-cfssl-new-cert" {
     path    = "/etc/kubernetes/ssl"
     cn      = "system:node:$(${var.node_name_command[var.cloud_provider]})"
     org     = "system:nodes"
+    get_ip  = "${var.get_ip_command[var.cloud_provider]}"
 
     extra_names = "${join(",", list(
-      "10.3.0.1",
+      "${var.kubernetes_master_default_svc[var.cloud_provider]}",
       "kubernetes",
       "kubernetes.default",
       "kubernetes.default.svc",

diff --git a/resources/disk-formatter.service → resources/aws-disk-formatter.service b/resources/disk-formatter.service → resources/aws-disk-formatter.service
diff --git a/resources/disk-mounter.mount → resources/aws-disk-mounter.mount b/resources/disk-mounter.mount → resources/aws-disk-mounter.mount
diff --git a/resources/cfssl-new-cert.sh b/resources/cfssl-new-cert.sh
@@ -5,7 +5,7 @@ set -o errexit
 mkdir -p ${path}
 cd ${path}
 
-_ip="$(ip addr show dev eth0 | grep 'inet ' | awk '{ print $2; }' | cut -d/ -f1)"
+_ip="$(${get_ip})"
 _hostname="$(hostname)"
 
 /opt/bin/cfssl gencert \

diff --git a/resources/gce-disk-formatter.service b/resources/gce-disk-formatter.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Format device with volume-id: ${volumeid}, if it has no filesystem
+After=dev-disk-by\x2did-google\x2d${volumeid}.device
+Requires=dev-disk-by\x2did-google\x2d${volumeid}.device
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+Environment=DEVICE=/dev/disk/by-id/google-${volumeid}
+ExecStart=/bin/sh -c "fsck -a $${DEVICE} || (mkfs.${filesystem} $${DEVICE} && mount $${DEVICE} /mnt && chown -R ${user}:${group} /mnt && umount /mnt)"
diff --git a/resources/gce-disk-mounter.mount b/resources/gce-disk-mounter.mount
@@ -0,0 +1,8 @@
+[Unit]
+Description=Mount device ${volumeid} to ${mountpoint}
+Requires=${disk-formatter}
+After=${disk-formatter}
+[Mount]
+What=/dev/disk/by-id/google-${volumeid}
+Where=${mountpoint}
+Type=${filesystem}
diff --git a/worker.tf b/worker.tf
@@ -13,6 +13,7 @@ data "template_file" "worker-cfssl-new-cert" {
     path        = "/etc/kubernetes/ssl"
     cn          = "system:node:$(${var.node_name_command[var.cloud_provider]})"
     org         = "system:nodes"
+    get_ip      = "${var.get_ip_command[var.cloud_provider]}"
     extra_names = ""
   }
 }