Cleaned up Variables

main.tf

@@ -7,7 +7,7 @@ provider "aws" {
 module "tls" {
   source         = "./modules/tls"
   internal-tld   = "${var.internal-tld}"
-  k8s-serviceip  = "${var.dns-service-ip}"
+  k8s-serviceip  = "${var.k8s-service-ip}"
   adminregion    = "${var.adminregion}"
   capem          = "${var.capem}"
   cakey          = "${var.cakey}"

modules/s3/Files/master_role_arn.txt

@@ -1 +1 @@
-arn:aws:iam::219614587848:role/master_role
+

modules/s3/Files/root_arn.txt

@@ -1 +1 @@
-arn:aws:iam::219614587848:root
+

modules/s3/Files/worker_role_arn.txt

@@ -1 +1 @@
-arn:aws:iam::219614587848:role/worker_role
+

terraform.tfvars

@@ -10,9 +10,10 @@ cluster-name = "terrakube"
 ## Template variables
 cluster-domain           = "cluster.local"
 dns-service-ip           = "10.3.0.10"
+service-cluster-ip-range = "10.3.0.0/24"
+k8s-service-ip = "10.3.0.1"
 kubernetes_image         = "quay.io/coreos/hyperkube:v1.5.2_coreos.0"
 pod-ip-range             = "10.2.0.0/16"
-service-cluster-ip-range = "10.3.0.0/24"
 
 # AMI info
 ownerid = "595879546273"

variables.tf

@@ -34,9 +34,19 @@ variable "cluster-domain" {
 
 variable "dns-service-ip" {
   description = "The VIP (Virtual IP) address of the cluster DNS service"
+  default     = "10.3.0.10"
+}
+
+variable "service-cluster-ip-range" {
+  description = "The CIDR network to use for service cluster VIPs (Virtual IPs)"
   default     = "10.3.0.0/24"
 }
 
+variable "k8s-service-ip" {
+  description = "The VIP (Virtual IP) address of the Kubernetes API Service. This must be set to the first IP in service-cluster range"
+  default     = "10.3.0.1"
+}
+
 variable "kubernetes_image" {
   description = "The docker kubernetes image we are using"
   default     = "quay.io/coreos/hyperkube:v1.5.2_coreos.0"
@@ -46,10 +56,6 @@ variable "pod-ip-range" {
   description = "The CIDR network to use for pod IPs"
 }
 
-variable "service-cluster-ip-range" {
-  description = "The CIDR network to use for service cluster VIPs (Virtual IPs)"
-}
-
 # AMI info
 
 variable "ownerid" {