Merge pull request #1477 from kinvolk/imran/reverting-the-reverted-ba…

…remetal-changes

Revert "Merge pull request #1426 (Baremetal changes that were reverted)

assets/terraform-modules/bare-metal/flatcar-linux/kubernetes/bootkube.tf

@@ -2,9 +2,10 @@
 module "bootkube" {
   source = "../../../bootkube"
 
-  cluster_name                    = var.cluster_name
-  api_servers                     = [var.k8s_domain_name]
-  etcd_servers                    = var.controller_domains
+  cluster_name = var.cluster_name
+  api_servers  = [format("%s.%s", var.cluster_name, var.k8s_domain_name)]
+  # Each instance of controller module generates the same set of etcd_servers.
+  etcd_servers                    = module.controller[0].etcd_servers
   etcd_endpoints                  = []
   asset_dir                       = var.asset_dir
   network_mtu                     = var.network_mtu
@@ -21,7 +22,7 @@ module "bootkube" {
   # Disable the self hosted kubelet.
   disable_self_hosted_kubelet = var.disable_self_hosted_kubelet
 
-  bootstrap_tokens     = [local.controller_bootstrap_token, local.worker_bootstrap_token]
+  bootstrap_tokens     = concat(module.controller.*.bootstrap_token, module.worker.*.bootstrap_token)
   enable_tls_bootstrap = true
   encrypt_pod_traffic  = var.encrypt_pod_traffic