From 0961e50f6496298584e5338ab2d77ac9f3022274 Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Fri, 19 May 2017 11:19:11 -0700
Subject: [PATCH] examples: Remove Kubernetes service IP inputs

* Calculate the required service IP values from the service CIDR
* These inputs were never truly customizable anyway since bootkube
start assumed the 1st, 10th, and 15th offsets for named services
---
 .../terraform/bootkube-install/variables.tf   | 29 +++----------------
 .../terraform/modules/bootkube/bootkube.tf    |  6 +---
 examples/terraform/modules/bootkube/groups.tf |  8 ++---
 .../terraform/modules/bootkube/variables.tf   | 29 +++----------------
 4 files changed, 13 insertions(+), 59 deletions(-)

diff --git a/examples/terraform/bootkube-install/variables.tf b/examples/terraform/bootkube-install/variables.tf
index b1c2eb8a..0d1f6599 100644
--- a/examples/terraform/bootkube-install/variables.tf
+++ b/examples/terraform/bootkube-install/variables.tf
@@ -74,35 +74,14 @@ variable "pod_cidr" {
 }
 
 variable "service_cidr" {
-  description = "CIDR IP range to assign Kubernetes services"
+  description = <<EOD
+CIDR IP range to assign Kubernetes services.
+The 1st IP will be reserved for kube_apiserver, the 10th IP will be reserved for kube-dns, the 15th IP will be reserved for self-hosted etcd, and the 200th IP will be reserved for bootstrap self-hosted etcd.
+EOD
   type        = "string"
   default     = "10.3.0.0/16"
 }
 
-variable "k8s_apiserver_service_ip" {
-  description = "Kubernetes service IP for kube-apiserver (must be within service_cidr)"
-  type        = "string"
-  default     = "10.3.0.1"
-}
-
-variable "k8s_dns_service_ip" {
-  description = "Kubernetes service IP for kube-dns (must be within server_cidr)"
-  type        = "string"
-  default     = "10.3.0.10"
-}
-
-variable "k8s_etcd_service_ip" {
-  type        = "string"
-  default     = "10.3.0.15"
-  description = "Kubernetes service IP for self-hosted etcd, if enabled (must be within service_cidr)"
-}
-
-variable "k8s_bootstrap_etcd_service_ip" {
-  type        = "string"
-  default     = "10.3.0.200"
-  description = "Kubernetes service IP for bootstrap self-hosted etcd, if enabled (must be within service_cidr)"
-}
-
 variable "container_linux_oem" {
   type        = "string"
   default     = ""
diff --git a/examples/terraform/modules/bootkube/bootkube.tf b/examples/terraform/modules/bootkube/bootkube.tf
index d9e3de1f..1d5d3bae 100644
--- a/examples/terraform/modules/bootkube/bootkube.tf
+++ b/examples/terraform/modules/bootkube/bootkube.tf
@@ -1,6 +1,6 @@
 # Self-hosted Kubernetes assets (kubeconfig, manifests)
 module "bootkube" {
-  source = "git::https://github.com/dghubble/bootkube-terraform.git?ref=209da6d09b1cadad655eee56d63ff0dc750c5bda"
+  source = "git::https://github.com/dghubble/bootkube-terraform.git?ref=368f09bcf189e1fe9d6185e1795e3c4bf8b1fab4"
 
   cluster_name                  = "${var.cluster_name}"
   api_servers                   = ["${var.k8s_domain_name}"]
@@ -8,9 +8,5 @@ module "bootkube" {
   asset_dir                     = "${var.asset_dir}"
   pod_cidr                      = "${var.pod_cidr}"
   service_cidr                  = "${var.service_cidr}"
-  kube_apiserver_service_ip     = "${var.k8s_apiserver_service_ip}"
-  kube_dns_service_ip           = "${var.k8s_dns_service_ip}"
-  kube_etcd_service_ip          = "${var.k8s_etcd_service_ip}"
-  kube_bootstrap_etcd_service_ip = "${var.k8s_bootstrap_etcd_service_ip}"
   experimental_self_hosted_etcd = "${var.experimental_self_hosted_etcd}"
 }
diff --git a/examples/terraform/modules/bootkube/groups.tf b/examples/terraform/modules/bootkube/groups.tf
index aa125a9f..213a99a7 100644
--- a/examples/terraform/modules/bootkube/groups.tf
+++ b/examples/terraform/modules/bootkube/groups.tf
@@ -34,8 +34,8 @@ resource "matchbox_group" "controller" {
     etcd_name            = "${element(var.controller_names, count.index)}"
     etcd_initial_cluster = "${join(",", formatlist("%s=http://%s:2380", var.controller_names, var.controller_domains))}"
     etcd_on_host         = "${var.experimental_self_hosted_etcd ? "false" : "true"}"
-    k8s_dns_service_ip   = "${var.k8s_dns_service_ip}"
-    k8s_etcd_service_ip  = "${var.k8s_etcd_service_ip}"
+    k8s_dns_service_ip   = "${module.bootkube.kube_dns_service_ip}"
+    k8s_etcd_service_ip  = "${module.bootkube.etcd_service_ip}"
     ssh_authorized_key   = "${var.ssh_authorized_key}"
   }
 }
@@ -54,8 +54,8 @@ resource "matchbox_group" "worker" {
     domain_name         = "${element(var.worker_domains, count.index)}"
     etcd_endpoints      = "${join(",", formatlist("%s:2379", var.controller_domains))}"
     etcd_on_host        = "${var.experimental_self_hosted_etcd ? "false" : "true"}"
-    k8s_dns_service_ip  = "${var.k8s_dns_service_ip}"
-    k8s_etcd_service_ip = "${var.k8s_etcd_service_ip}"
+    k8s_dns_service_ip   = "${module.bootkube.kube_dns_service_ip}"
+    k8s_etcd_service_ip  = "${module.bootkube.etcd_service_ip}"
     ssh_authorized_key  = "${var.ssh_authorized_key}"
   }
 }
diff --git a/examples/terraform/modules/bootkube/variables.tf b/examples/terraform/modules/bootkube/variables.tf
index 03e51dfa..bb34b183 100644
--- a/examples/terraform/modules/bootkube/variables.tf
+++ b/examples/terraform/modules/bootkube/variables.tf
@@ -69,35 +69,14 @@ variable "pod_cidr" {
 }
 
 variable "service_cidr" {
-  description = "CIDR IP range to assign Kubernetes services"
+  description = <<EOD
+CIDR IP range to assign Kubernetes services.
+The 1st IP will be reserved for kube_apiserver, the 10th IP will be reserved for kube-dns, the 15th IP will be reserved for self-hosted etcd, and the 200th IP will be reserved for bootstrap self-hosted etcd.
+EOD
   type        = "string"
   default     = "10.3.0.0/16"
 }
 
-variable "k8s_apiserver_service_ip" {
-  description = "Kubernetes service IP for kube-apiserver (must be within service_cidr)"
-  type        = "string"
-  default     = "10.3.0.1"
-}
-
-variable "k8s_dns_service_ip" {
-  description = "Kubernetes service IP for kube-dns (must be within server_cidr)"
-  type        = "string"
-  default     = "10.3.0.10"
-}
-
-variable "k8s_etcd_service_ip" {
-  type        = "string"
-  default     = "10.3.0.15"
-  description = "Kubernetes service IP for self-hosted etcd, if enabled (must be within service_cidr)"
-}
-
-variable "k8s_bootstrap_etcd_service_ip" {
-  type        = "string"
-  default     = "10.3.0.200"
-  description = "Kubernetes service IP for bootstrap self-hosted etcd, if enabled (must be within service_cidr)"
-}
-
 variable "container_linux_oem" {
   type        = "string"
   default     = ""