Support extra ignition files and systemd units in elastikube and supp…

…ort load balancers in worker module

aws/elastikube/etcd.tf

@@ -10,5 +10,7 @@ module "etcd" {
   zone_id    = "${aws_route53_zone.private.zone_id}"
   s3_bucket  = "${aws_s3_bucket.ignition.id}"
 
-  extra_tags = "${var.extra_tags}"
+  extra_ignition_file_ids         = ["${var.extra_etcd_ignition_file_ids}"]
+  extra_ignition_systemd_unit_ids = ["${var.extra_etcd_ignition_systemd_unit_ids}"]
+  extra_tags                      = "${var.extra_tags}"
 }

aws/elastikube/master.tf

@@ -33,7 +33,9 @@ module "master" {
       ))}",
   ]
 
-  s3_bucket = "${aws_s3_bucket.ignition.id}"
+  s3_bucket                       = "${aws_s3_bucket.ignition.id}"
+  extra_ignition_file_ids         = ["${var.extra_ignition_file_ids}"]
+  extra_ignition_systemd_unit_ids = ["${var.extra_ignition_systemd_unit_ids}"]
 
   extra_tags = "${var.extra_tags}"
 }

aws/elastikube/variables.tf

@@ -111,6 +111,30 @@ variable "extra_master_node_taints" {
 EOF
 }
 
+variable "extra_etcd_ignition_file_ids" {
+  type        = "list"
+  default     = []
+  description = "(Optional) Additional ignition file IDs for etcds. See https://www.terraform.io/docs/providers/ignition/d/file.html for more details."
+}
+
+variable "extra_etcd_ignition_systemd_unit_ids" {
+  type        = "list"
+  default     = []
+  description = "(Optional) Additional ignition systemd unit IDs for etcds. See https://www.terraform.io/docs/providers/ignition/d/systemd_unit.html for more details."
+}
+
+variable "extra_ignition_file_ids" {
+  type        = "list"
+  default     = []
+  description = "(Optional) Additional ignition file IDs for masters. See https://www.terraform.io/docs/providers/ignition/d/file.html for more details."
+}
+
+variable "extra_ignition_systemd_unit_ids" {
+  type        = "list"
+  default     = []
+  description = "(Optional) Additional ignition systemd unit IDs for masters. See https://www.terraform.io/docs/providers/ignition/d/systemd_unit.html for more details."
+}
+
 variable "extra_tags" {
   description = "(Optional) Extra AWS tags to be applied to the resources."
   type        = "map"

aws/kube-etcd/ignition.tf

@@ -30,12 +30,14 @@ data "ignition_config" "main" {
     module.ignition_docker.files,
     module.ignition_etcd.files,
     module.ignition_node_exporter.files,
+    var.extra_ignition_file_ids,
   ))}"]
 
   systemd = ["${compact(concat(
     module.ignition_docker.systemd_units,
     module.ignition_etcd.systemd_units,
     module.ignition_node_exporter.systemd_units,
+    var.extra_ignition_systemd_unit_ids,
   ))}"]
 }
 

aws/kube-etcd/variables.tf

@@ -102,6 +102,18 @@ variable "s3_bucket" {
 EOF
 }
 
+variable "extra_ignition_file_ids" {
+  type        = "list"
+  default     = []
+  description = "(Optional) Additional ignition file IDs. See https://www.terraform.io/docs/providers/ignition/d/file.html for more details."
+}
+
+variable "extra_ignition_systemd_unit_ids" {
+  type        = "list"
+  default     = []
+  description = "(Optional) Additional ignition systemd unit IDs. See https://www.terraform.io/docs/providers/ignition/d/systemd_unit.html for more details."
+}
+
 variable "extra_tags" {
   type        = "map"
   default     = {}

aws/kube-master/ignition.tf

@@ -30,6 +30,7 @@ data "ignition_config" "main" {
     module.ignition_kube_addon_dns.files,
     module.ignition_kube_addon_proxy.files,
     module.ignition_kube_addon_manager.files,
+    var.extra_ignition_file_ids,
   ))}"]
 
   systemd = ["${compact(concat(
@@ -42,6 +43,7 @@ data "ignition_config" "main" {
     module.ignition_kube_addon_dns.systemd_units,
     module.ignition_kube_addon_proxy.systemd_units,
     module.ignition_kube_addon_manager.systemd_units,
+    var.extra_ignition_systemd_unit_ids,
   ))}"]
 }
 

aws/kube-master/variables.tf

@@ -66,10 +66,6 @@ variable "etcd_endpoints" {
 
 variable "etcd_certs_config" {
   type = "map"
-
-  default = {
-    # ca_cert_pem     = ""  # client_key_pem  = ""  # client_cert_pem = ""
-  }
 }
 
 variable "certs_validity_period_hours" {
@@ -120,6 +116,18 @@ variable "s3_bucket" {
 EOF
 }
 
+variable "extra_ignition_file_ids" {
+  type        = "list"
+  default     = []
+  description = "(Optional) Additional ignition file IDs. See https://www.terraform.io/docs/providers/ignition/d/file.html for more details."
+}
+
+variable "extra_ignition_systemd_unit_ids" {
+  type        = "list"
+  default     = []
+  description = "(Optional) Additional ignition systemd unit IDs. See https://www.terraform.io/docs/providers/ignition/d/systemd_unit.html for more details."
+}
+
 variable "extra_tags" {
   type        = "map"
   default     = {}

aws/kube-worker-general/ignition.tf

@@ -40,12 +40,14 @@ data "ignition_config" "main" {
     module.ignition_docker.files,
     module.ignition_kubelet.files,
     module.ignition_kube_config.files,
+    var.extra_ignition_file_ids,
   ))}"]
 
   systemd = ["${compact(concat(
     module.ignition_docker.systemd_units,
     module.ignition_kubelet.systemd_units,
     module.ignition_kube_config.systemd_units,
+    var.extra_ignition_systemd_unit_ids,
   ))}"]
 }
 

aws/kube-worker-general/variables.tf

@@ -86,6 +86,30 @@ variable "s3_bucket" {
 EOF
 }
 
+variable "extra_ignition_file_ids" {
+  type        = "list"
+  default     = []
+  description = "(Optional) Additional ignition file IDs. See https://www.terraform.io/docs/providers/ignition/d/file.html for more details."
+}
+
+variable "extra_ignition_systemd_unit_ids" {
+  type        = "list"
+  default     = []
+  description = "(Optional) Additional ignition systemd unit IDs. See https://www.terraform.io/docs/providers/ignition/d/systemd_unit.html for more details."
+}
+
+variable "load_balancer_ids" {
+  type        = "list"
+  default     = []
+  description = "(Optional) A list of elastic load balancer names to add to the autoscaling group names. Only valid for classic load balancers. For ALBs, use target_group_arns instead."
+}
+
+variable "target_group_arns" {
+  type        = "list"
+  default     = []
+  description = "(Optional) A list of aws_alb_target_group ARNs, for use with Application Load Balancing."
+}
+
 variable "extra_tags" {
   type        = "map"
   default     = {}

aws/kube-worker-general/worker.tf

@@ -27,6 +27,8 @@ resource "aws_autoscaling_group" "worker" {
   min_size             = "${var.worker_config["instance_count"]}"
   launch_configuration = "${aws_launch_configuration.worker.id}"
   vpc_zone_identifier  = ["${var.subnet_ids}"]
+  load_balancers       = ["${var.load_balancer_ids}"]
+  target_group_arns    = ["${var.target_group_arns}"]
 
   tags = [
     {