From 96b646cf6d4bfb416fb64eeaf3fc2742bc528d69 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 14 Sep 2019 16:24:32 -0700 Subject: [PATCH] Rename bootkube modules to bootstrap * Rename render module from bootkube to bootstrap. Avoid confusion with the kubernetes-incubator/bootkube tool since it is no longer used * Use the poseidon/terraform-render-bootstrap Terraform module (formerly poseidon/terraform-render-bootkube) * https://github.com/poseidon/terraform-render-bootkube/pull/149 --- aws/container-linux/kubernetes/bootkube.tf | 4 ++-- aws/container-linux/kubernetes/controllers.tf | 2 +- aws/container-linux/kubernetes/outputs.tf | 4 ++-- aws/container-linux/kubernetes/ssh.tf | 16 +++++++-------- aws/container-linux/kubernetes/workers.tf | 2 +- aws/fedora-coreos/kubernetes/bootkube.tf | 4 ++-- aws/fedora-coreos/kubernetes/controllers.tf | 2 +- aws/fedora-coreos/kubernetes/outputs.tf | 4 ++-- aws/fedora-coreos/kubernetes/ssh.tf | 16 +++++++-------- aws/fedora-coreos/kubernetes/workers.tf | 2 +- azure/container-linux/kubernetes/bootkube.tf | 4 ++-- .../container-linux/kubernetes/controllers.tf | 2 +- azure/container-linux/kubernetes/outputs.tf | 4 ++-- azure/container-linux/kubernetes/ssh.tf | 16 +++++++-------- azure/container-linux/kubernetes/workers.tf | 2 +- .../container-linux/kubernetes/bootkube.tf | 4 ++-- .../container-linux/kubernetes/outputs.tf | 2 +- .../container-linux/kubernetes/profiles.tf | 4 ++-- bare-metal/container-linux/kubernetes/ssh.tf | 20 +++++++++---------- .../fedora-coreos/kubernetes/bootkube.tf | 4 ++-- .../fedora-coreos/kubernetes/outputs.tf | 2 +- .../fedora-coreos/kubernetes/profiles.tf | 4 ++-- bare-metal/fedora-coreos/kubernetes/ssh.tf | 20 +++++++++---------- .../container-linux/kubernetes/bootkube.tf | 4 ++-- .../container-linux/kubernetes/outputs.tf | 2 +- .../container-linux/kubernetes/ssh.tf | 20 +++++++++---------- docs/advanced/customization.md | 2 +- .../container-linux/kubernetes/bootkube.tf | 4 ++-- .../container-linux/kubernetes/controllers.tf | 2 +- .../container-linux/kubernetes/outputs.tf | 4 ++-- .../container-linux/kubernetes/ssh.tf | 16 +++++++-------- .../container-linux/kubernetes/workers.tf | 2 +- 32 files changed, 100 insertions(+), 100 deletions(-) diff --git a/aws/container-linux/kubernetes/bootkube.tf b/aws/container-linux/kubernetes/bootkube.tf index 9390a752..53a45edd 100644 --- a/aws/container-linux/kubernetes/bootkube.tf +++ b/aws/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) -module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=6e59af71138bc5f784453873074de16e7ee150eb" +module "bootstrap" { + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=6e59af71138bc5f784453873074de16e7ee150eb" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/aws/container-linux/kubernetes/controllers.tf b/aws/container-linux/kubernetes/controllers.tf index 75e28c83..28267945 100644 --- a/aws/container-linux/kubernetes/controllers.tf +++ b/aws/container-linux/kubernetes/controllers.tf @@ -71,7 +71,7 @@ data "template_file" "controller-configs" { # etcd0=https://cluster-etcd0.example.com,etcd1=https://cluster-etcd1.example.com,... etcd_initial_cluster = join(",", data.template_file.etcds.*.rendered) cgroup_driver = local.flavor == "flatcar" && local.channel == "edge" ? "systemd" : "cgroupfs" - kubeconfig = indent(10, module.bootkube.kubeconfig-kubelet) + kubeconfig = indent(10, module.bootstrap.kubeconfig-kubelet) ssh_authorized_key = var.ssh_authorized_key cluster_dns_service_ip = cidrhost(var.service_cidr, 10) cluster_domain_suffix = var.cluster_domain_suffix diff --git a/aws/container-linux/kubernetes/outputs.tf b/aws/container-linux/kubernetes/outputs.tf index 471c3300..d9afc7bd 100644 --- a/aws/container-linux/kubernetes/outputs.tf +++ b/aws/container-linux/kubernetes/outputs.tf @@ -1,5 +1,5 @@ output "kubeconfig-admin" { - value = module.bootkube.kubeconfig-admin + value = module.bootstrap.kubeconfig-admin } # Outputs for Kubernetes Ingress @@ -32,7 +32,7 @@ output "worker_security_groups" { } output "kubeconfig" { - value = module.bootkube.kubeconfig-kubelet + value = module.bootstrap.kubeconfig-kubelet } # Outputs for custom load balancing diff --git a/aws/container-linux/kubernetes/ssh.tf b/aws/container-linux/kubernetes/ssh.tf index 5f027d17..4ebd5f24 100644 --- a/aws/container-linux/kubernetes/ssh.tf +++ b/aws/container-linux/kubernetes/ssh.tf @@ -3,7 +3,7 @@ resource "null_resource" "copy-controller-secrets" { count = var.controller_count depends_on = [ - module.bootkube, + module.bootstrap, ] connection { @@ -14,37 +14,37 @@ resource "null_resource" "copy-controller-secrets" { } provisioner "file" { - content = module.bootkube.etcd_ca_cert + content = module.bootstrap.etcd_ca_cert destination = "$HOME/etcd-client-ca.crt" } provisioner "file" { - content = module.bootkube.etcd_client_cert + content = module.bootstrap.etcd_client_cert destination = "$HOME/etcd-client.crt" } provisioner "file" { - content = module.bootkube.etcd_client_key + content = module.bootstrap.etcd_client_key destination = "$HOME/etcd-client.key" } provisioner "file" { - content = module.bootkube.etcd_server_cert + content = module.bootstrap.etcd_server_cert destination = "$HOME/etcd-server.crt" } provisioner "file" { - content = module.bootkube.etcd_server_key + content = module.bootstrap.etcd_server_key destination = "$HOME/etcd-server.key" } provisioner "file" { - content = module.bootkube.etcd_peer_cert + content = module.bootstrap.etcd_peer_cert destination = "$HOME/etcd-peer.crt" } provisioner "file" { - content = module.bootkube.etcd_peer_key + content = module.bootstrap.etcd_peer_key destination = "$HOME/etcd-peer.key" } diff --git a/aws/container-linux/kubernetes/workers.tf b/aws/container-linux/kubernetes/workers.tf index 5b3b787d..b5df2213 100644 --- a/aws/container-linux/kubernetes/workers.tf +++ b/aws/container-linux/kubernetes/workers.tf @@ -14,7 +14,7 @@ module "workers" { target_groups = var.worker_target_groups # configuration - kubeconfig = module.bootkube.kubeconfig-kubelet + kubeconfig = module.bootstrap.kubeconfig-kubelet ssh_authorized_key = var.ssh_authorized_key service_cidr = var.service_cidr cluster_domain_suffix = var.cluster_domain_suffix diff --git a/aws/fedora-coreos/kubernetes/bootkube.tf b/aws/fedora-coreos/kubernetes/bootkube.tf index 10002329..26ea352e 100644 --- a/aws/fedora-coreos/kubernetes/bootkube.tf +++ b/aws/fedora-coreos/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) -module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=6e59af71138bc5f784453873074de16e7ee150eb" +module "bootstrap" { + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=6e59af71138bc5f784453873074de16e7ee150eb" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/aws/fedora-coreos/kubernetes/controllers.tf b/aws/fedora-coreos/kubernetes/controllers.tf index 97e792d8..e4bd9ddb 100644 --- a/aws/fedora-coreos/kubernetes/controllers.tf +++ b/aws/fedora-coreos/kubernetes/controllers.tf @@ -67,7 +67,7 @@ data "template_file" "controller-configs" { etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}" # etcd0=https://cluster-etcd0.example.com,etcd1=https://cluster-etcd1.example.com,... etcd_initial_cluster = join(",", data.template_file.etcds.*.rendered) - kubeconfig = indent(10, module.bootkube.kubeconfig-kubelet) + kubeconfig = indent(10, module.bootstrap.kubeconfig-kubelet) ssh_authorized_key = var.ssh_authorized_key cluster_dns_service_ip = cidrhost(var.service_cidr, 10) cluster_domain_suffix = var.cluster_domain_suffix diff --git a/aws/fedora-coreos/kubernetes/outputs.tf b/aws/fedora-coreos/kubernetes/outputs.tf index 471c3300..d9afc7bd 100644 --- a/aws/fedora-coreos/kubernetes/outputs.tf +++ b/aws/fedora-coreos/kubernetes/outputs.tf @@ -1,5 +1,5 @@ output "kubeconfig-admin" { - value = module.bootkube.kubeconfig-admin + value = module.bootstrap.kubeconfig-admin } # Outputs for Kubernetes Ingress @@ -32,7 +32,7 @@ output "worker_security_groups" { } output "kubeconfig" { - value = module.bootkube.kubeconfig-kubelet + value = module.bootstrap.kubeconfig-kubelet } # Outputs for custom load balancing diff --git a/aws/fedora-coreos/kubernetes/ssh.tf b/aws/fedora-coreos/kubernetes/ssh.tf index 2e39779e..2e2cc3fe 100644 --- a/aws/fedora-coreos/kubernetes/ssh.tf +++ b/aws/fedora-coreos/kubernetes/ssh.tf @@ -3,7 +3,7 @@ resource "null_resource" "copy-controller-secrets" { count = var.controller_count depends_on = [ - module.bootkube, + module.bootstrap, ] connection { @@ -14,37 +14,37 @@ resource "null_resource" "copy-controller-secrets" { } provisioner "file" { - content = module.bootkube.etcd_ca_cert + content = module.bootstrap.etcd_ca_cert destination = "$HOME/etcd-client-ca.crt" } provisioner "file" { - content = module.bootkube.etcd_client_cert + content = module.bootstrap.etcd_client_cert destination = "$HOME/etcd-client.crt" } provisioner "file" { - content = module.bootkube.etcd_client_key + content = module.bootstrap.etcd_client_key destination = "$HOME/etcd-client.key" } provisioner "file" { - content = module.bootkube.etcd_server_cert + content = module.bootstrap.etcd_server_cert destination = "$HOME/etcd-server.crt" } provisioner "file" { - content = module.bootkube.etcd_server_key + content = module.bootstrap.etcd_server_key destination = "$HOME/etcd-server.key" } provisioner "file" { - content = module.bootkube.etcd_peer_cert + content = module.bootstrap.etcd_peer_cert destination = "$HOME/etcd-peer.crt" } provisioner "file" { - content = module.bootkube.etcd_peer_key + content = module.bootstrap.etcd_peer_key destination = "$HOME/etcd-peer.key" } diff --git a/aws/fedora-coreos/kubernetes/workers.tf b/aws/fedora-coreos/kubernetes/workers.tf index af74d8bb..4a2e5076 100644 --- a/aws/fedora-coreos/kubernetes/workers.tf +++ b/aws/fedora-coreos/kubernetes/workers.tf @@ -14,7 +14,7 @@ module "workers" { target_groups = var.worker_target_groups # configuration - kubeconfig = module.bootkube.kubeconfig-kubelet + kubeconfig = module.bootstrap.kubeconfig-kubelet ssh_authorized_key = var.ssh_authorized_key service_cidr = var.service_cidr cluster_domain_suffix = var.cluster_domain_suffix diff --git a/azure/container-linux/kubernetes/bootkube.tf b/azure/container-linux/kubernetes/bootkube.tf index 70c889b3..d5983f85 100644 --- a/azure/container-linux/kubernetes/bootkube.tf +++ b/azure/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) -module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=6e59af71138bc5f784453873074de16e7ee150eb" +module "bootstrap" { + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=6e59af71138bc5f784453873074de16e7ee150eb" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/azure/container-linux/kubernetes/controllers.tf b/azure/container-linux/kubernetes/controllers.tf index c57f42da..36518d18 100644 --- a/azure/container-linux/kubernetes/controllers.tf +++ b/azure/container-linux/kubernetes/controllers.tf @@ -155,7 +155,7 @@ data "template_file" "controller-configs" { etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}" # etcd0=https://cluster-etcd0.example.com,etcd1=https://cluster-etcd1.example.com,... etcd_initial_cluster = join(",", data.template_file.etcds.*.rendered) - kubeconfig = indent(10, module.bootkube.kubeconfig-kubelet) + kubeconfig = indent(10, module.bootstrap.kubeconfig-kubelet) ssh_authorized_key = var.ssh_authorized_key cluster_dns_service_ip = cidrhost(var.service_cidr, 10) cluster_domain_suffix = var.cluster_domain_suffix diff --git a/azure/container-linux/kubernetes/outputs.tf b/azure/container-linux/kubernetes/outputs.tf index 79a936a8..39169d8d 100644 --- a/azure/container-linux/kubernetes/outputs.tf +++ b/azure/container-linux/kubernetes/outputs.tf @@ -1,5 +1,5 @@ output "kubeconfig-admin" { - value = module.bootkube.kubeconfig-admin + value = module.bootstrap.kubeconfig-admin } # Outputs for Kubernetes Ingress @@ -28,7 +28,7 @@ output "security_group_id" { } output "kubeconfig" { - value = module.bootkube.kubeconfig-kubelet + value = module.bootstrap.kubeconfig-kubelet } # Outputs for custom firewalling diff --git a/azure/container-linux/kubernetes/ssh.tf b/azure/container-linux/kubernetes/ssh.tf index 961cb1df..f8012c27 100644 --- a/azure/container-linux/kubernetes/ssh.tf +++ b/azure/container-linux/kubernetes/ssh.tf @@ -3,7 +3,7 @@ resource "null_resource" "copy-controller-secrets" { count = var.controller_count depends_on = [ - module.bootkube, + module.bootstrap, azurerm_virtual_machine.controllers ] @@ -15,37 +15,37 @@ resource "null_resource" "copy-controller-secrets" { } provisioner "file" { - content = module.bootkube.etcd_ca_cert + content = module.bootstrap.etcd_ca_cert destination = "$HOME/etcd-client-ca.crt" } provisioner "file" { - content = module.bootkube.etcd_client_cert + content = module.bootstrap.etcd_client_cert destination = "$HOME/etcd-client.crt" } provisioner "file" { - content = module.bootkube.etcd_client_key + content = module.bootstrap.etcd_client_key destination = "$HOME/etcd-client.key" } provisioner "file" { - content = module.bootkube.etcd_server_cert + content = module.bootstrap.etcd_server_cert destination = "$HOME/etcd-server.crt" } provisioner "file" { - content = module.bootkube.etcd_server_key + content = module.bootstrap.etcd_server_key destination = "$HOME/etcd-server.key" } provisioner "file" { - content = module.bootkube.etcd_peer_cert + content = module.bootstrap.etcd_peer_cert destination = "$HOME/etcd-peer.crt" } provisioner "file" { - content = module.bootkube.etcd_peer_key + content = module.bootstrap.etcd_peer_key destination = "$HOME/etcd-peer.key" } diff --git a/azure/container-linux/kubernetes/workers.tf b/azure/container-linux/kubernetes/workers.tf index 0f40da90..5775f55c 100644 --- a/azure/container-linux/kubernetes/workers.tf +++ b/azure/container-linux/kubernetes/workers.tf @@ -15,7 +15,7 @@ module "workers" { priority = var.worker_priority # configuration - kubeconfig = module.bootkube.kubeconfig-kubelet + kubeconfig = module.bootstrap.kubeconfig-kubelet ssh_authorized_key = var.ssh_authorized_key service_cidr = var.service_cidr cluster_domain_suffix = var.cluster_domain_suffix diff --git a/bare-metal/container-linux/kubernetes/bootkube.tf b/bare-metal/container-linux/kubernetes/bootkube.tf index 67efc0c7..9c3bc841 100644 --- a/bare-metal/container-linux/kubernetes/bootkube.tf +++ b/bare-metal/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) -module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=6e59af71138bc5f784453873074de16e7ee150eb" +module "bootstrap" { + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=6e59af71138bc5f784453873074de16e7ee150eb" cluster_name = var.cluster_name api_servers = [var.k8s_domain_name] diff --git a/bare-metal/container-linux/kubernetes/outputs.tf b/bare-metal/container-linux/kubernetes/outputs.tf index 1fd43af6..8e81ca1e 100644 --- a/bare-metal/container-linux/kubernetes/outputs.tf +++ b/bare-metal/container-linux/kubernetes/outputs.tf @@ -1,4 +1,4 @@ output "kubeconfig-admin" { - value = module.bootkube.kubeconfig-admin + value = module.bootstrap.kubeconfig-admin } diff --git a/bare-metal/container-linux/kubernetes/profiles.tf b/bare-metal/container-linux/kubernetes/profiles.tf index 400ef6ed..0a6ba49e 100644 --- a/bare-metal/container-linux/kubernetes/profiles.tf +++ b/bare-metal/container-linux/kubernetes/profiles.tf @@ -160,7 +160,7 @@ data "template_file" "controller-configs" { etcd_name = element(var.controller_names, count.index) etcd_initial_cluster = join(",", formatlist("%s=https://%s:2380", var.controller_names, var.controller_domains)) cgroup_driver = var.os_channel == "flatcar-edge" ? "systemd" : "cgroupfs" - cluster_dns_service_ip = module.bootkube.cluster_dns_service_ip + cluster_dns_service_ip = module.bootstrap.cluster_dns_service_ip cluster_domain_suffix = var.cluster_domain_suffix ssh_authorized_key = var.ssh_authorized_key } @@ -188,7 +188,7 @@ data "template_file" "worker-configs" { vars = { domain_name = element(var.worker_domains, count.index) cgroup_driver = var.os_channel == "flatcar-edge" ? "systemd" : "cgroupfs" - cluster_dns_service_ip = module.bootkube.cluster_dns_service_ip + cluster_dns_service_ip = module.bootstrap.cluster_dns_service_ip cluster_domain_suffix = var.cluster_domain_suffix ssh_authorized_key = var.ssh_authorized_key } diff --git a/bare-metal/container-linux/kubernetes/ssh.tf b/bare-metal/container-linux/kubernetes/ssh.tf index 30e0be7a..2a85da6c 100644 --- a/bare-metal/container-linux/kubernetes/ssh.tf +++ b/bare-metal/container-linux/kubernetes/ssh.tf @@ -8,7 +8,7 @@ resource "null_resource" "copy-controller-secrets" { matchbox_group.install, matchbox_group.controller, matchbox_group.worker, - module.bootkube, + module.bootstrap, ] connection { @@ -19,42 +19,42 @@ resource "null_resource" "copy-controller-secrets" { } provisioner "file" { - content = module.bootkube.kubeconfig-kubelet + content = module.bootstrap.kubeconfig-kubelet destination = "$HOME/kubeconfig" } provisioner "file" { - content = module.bootkube.etcd_ca_cert + content = module.bootstrap.etcd_ca_cert destination = "$HOME/etcd-client-ca.crt" } provisioner "file" { - content = module.bootkube.etcd_client_cert + content = module.bootstrap.etcd_client_cert destination = "$HOME/etcd-client.crt" } provisioner "file" { - content = module.bootkube.etcd_client_key + content = module.bootstrap.etcd_client_key destination = "$HOME/etcd-client.key" } provisioner "file" { - content = module.bootkube.etcd_server_cert + content = module.bootstrap.etcd_server_cert destination = "$HOME/etcd-server.crt" } provisioner "file" { - content = module.bootkube.etcd_server_key + content = module.bootstrap.etcd_server_key destination = "$HOME/etcd-server.key" } provisioner "file" { - content = module.bootkube.etcd_peer_cert + content = module.bootstrap.etcd_peer_cert destination = "$HOME/etcd-peer.crt" } provisioner "file" { - content = module.bootkube.etcd_peer_key + content = module.bootstrap.etcd_peer_key destination = "$HOME/etcd-peer.key" } @@ -105,7 +105,7 @@ resource "null_resource" "copy-worker-secrets" { } provisioner "file" { - content = module.bootkube.kubeconfig-kubelet + content = module.bootstrap.kubeconfig-kubelet destination = "$HOME/kubeconfig" } diff --git a/bare-metal/fedora-coreos/kubernetes/bootkube.tf b/bare-metal/fedora-coreos/kubernetes/bootkube.tf index a977981b..0c49932f 100644 --- a/bare-metal/fedora-coreos/kubernetes/bootkube.tf +++ b/bare-metal/fedora-coreos/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) -module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=6e59af71138bc5f784453873074de16e7ee150eb" +module "bootstrap" { + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=6e59af71138bc5f784453873074de16e7ee150eb" cluster_name = var.cluster_name api_servers = [var.k8s_domain_name] diff --git a/bare-metal/fedora-coreos/kubernetes/outputs.tf b/bare-metal/fedora-coreos/kubernetes/outputs.tf index 1fd43af6..8e81ca1e 100644 --- a/bare-metal/fedora-coreos/kubernetes/outputs.tf +++ b/bare-metal/fedora-coreos/kubernetes/outputs.tf @@ -1,4 +1,4 @@ output "kubeconfig-admin" { - value = module.bootkube.kubeconfig-admin + value = module.bootstrap.kubeconfig-admin } diff --git a/bare-metal/fedora-coreos/kubernetes/profiles.tf b/bare-metal/fedora-coreos/kubernetes/profiles.tf index b17a655a..80771c9b 100644 --- a/bare-metal/fedora-coreos/kubernetes/profiles.tf +++ b/bare-metal/fedora-coreos/kubernetes/profiles.tf @@ -56,7 +56,7 @@ data "template_file" "controller-configs" { domain_name = var.controller_domains[count.index] etcd_name = var.controller_names[count.index] etcd_initial_cluster = join(",", formatlist("%s=https://%s:2380", var.controller_names, var.controller_domains)) - cluster_dns_service_ip = module.bootkube.cluster_dns_service_ip + cluster_dns_service_ip = module.bootstrap.cluster_dns_service_ip cluster_domain_suffix = var.cluster_domain_suffix ssh_authorized_key = var.ssh_authorized_key } @@ -89,7 +89,7 @@ data "template_file" "worker-configs" { template = file("${path.module}/fcc/worker.yaml") vars = { domain_name = var.worker_domains[count.index] - cluster_dns_service_ip = module.bootkube.cluster_dns_service_ip + cluster_dns_service_ip = module.bootstrap.cluster_dns_service_ip cluster_domain_suffix = var.cluster_domain_suffix ssh_authorized_key = var.ssh_authorized_key } diff --git a/bare-metal/fedora-coreos/kubernetes/ssh.tf b/bare-metal/fedora-coreos/kubernetes/ssh.tf index 0a10bf61..002faf1f 100644 --- a/bare-metal/fedora-coreos/kubernetes/ssh.tf +++ b/bare-metal/fedora-coreos/kubernetes/ssh.tf @@ -7,7 +7,7 @@ resource "null_resource" "copy-controller-secrets" { depends_on = [ matchbox_group.controller, matchbox_group.worker, - module.bootkube, + module.bootstrap, ] connection { @@ -18,42 +18,42 @@ resource "null_resource" "copy-controller-secrets" { } provisioner "file" { - content = module.bootkube.kubeconfig-kubelet + content = module.bootstrap.kubeconfig-kubelet destination = "$HOME/kubeconfig" } provisioner "file" { - content = module.bootkube.etcd_ca_cert + content = module.bootstrap.etcd_ca_cert destination = "$HOME/etcd-client-ca.crt" } provisioner "file" { - content = module.bootkube.etcd_client_cert + content = module.bootstrap.etcd_client_cert destination = "$HOME/etcd-client.crt" } provisioner "file" { - content = module.bootkube.etcd_client_key + content = module.bootstrap.etcd_client_key destination = "$HOME/etcd-client.key" } provisioner "file" { - content = module.bootkube.etcd_server_cert + content = module.bootstrap.etcd_server_cert destination = "$HOME/etcd-server.crt" } provisioner "file" { - content = module.bootkube.etcd_server_key + content = module.bootstrap.etcd_server_key destination = "$HOME/etcd-server.key" } provisioner "file" { - content = module.bootkube.etcd_peer_cert + content = module.bootstrap.etcd_peer_cert destination = "$HOME/etcd-peer.crt" } provisioner "file" { - content = module.bootkube.etcd_peer_key + content = module.bootstrap.etcd_peer_key destination = "$HOME/etcd-peer.key" } @@ -101,7 +101,7 @@ resource "null_resource" "copy-worker-secrets" { } provisioner "file" { - content = module.bootkube.kubeconfig-kubelet + content = module.bootstrap.kubeconfig-kubelet destination = "$HOME/kubeconfig" } diff --git a/digital-ocean/container-linux/kubernetes/bootkube.tf b/digital-ocean/container-linux/kubernetes/bootkube.tf index b7711aea..e3ed992e 100644 --- a/digital-ocean/container-linux/kubernetes/bootkube.tf +++ b/digital-ocean/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) -module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=6e59af71138bc5f784453873074de16e7ee150eb" +module "bootstrap" { + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=6e59af71138bc5f784453873074de16e7ee150eb" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/digital-ocean/container-linux/kubernetes/outputs.tf b/digital-ocean/container-linux/kubernetes/outputs.tf index bf05b4a0..fe5338ef 100644 --- a/digital-ocean/container-linux/kubernetes/outputs.tf +++ b/digital-ocean/container-linux/kubernetes/outputs.tf @@ -1,5 +1,5 @@ output "kubeconfig-admin" { - value = module.bootkube.kubeconfig-admin + value = module.bootstrap.kubeconfig-admin } output "controllers_dns" { diff --git a/digital-ocean/container-linux/kubernetes/ssh.tf b/digital-ocean/container-linux/kubernetes/ssh.tf index 1d334ccb..a1b734d1 100644 --- a/digital-ocean/container-linux/kubernetes/ssh.tf +++ b/digital-ocean/container-linux/kubernetes/ssh.tf @@ -3,7 +3,7 @@ resource "null_resource" "copy-controller-secrets" { count = var.controller_count depends_on = [ - module.bootkube, + module.bootstrap, digitalocean_firewall.rules ] @@ -15,42 +15,42 @@ resource "null_resource" "copy-controller-secrets" { } provisioner "file" { - content = module.bootkube.kubeconfig-kubelet + content = module.bootstrap.kubeconfig-kubelet destination = "$HOME/kubeconfig" } provisioner "file" { - content = module.bootkube.etcd_ca_cert + content = module.bootstrap.etcd_ca_cert destination = "$HOME/etcd-client-ca.crt" } provisioner "file" { - content = module.bootkube.etcd_client_cert + content = module.bootstrap.etcd_client_cert destination = "$HOME/etcd-client.crt" } provisioner "file" { - content = module.bootkube.etcd_client_key + content = module.bootstrap.etcd_client_key destination = "$HOME/etcd-client.key" } provisioner "file" { - content = module.bootkube.etcd_server_cert + content = module.bootstrap.etcd_server_cert destination = "$HOME/etcd-server.crt" } provisioner "file" { - content = module.bootkube.etcd_server_key + content = module.bootstrap.etcd_server_key destination = "$HOME/etcd-server.key" } provisioner "file" { - content = module.bootkube.etcd_peer_cert + content = module.bootstrap.etcd_peer_cert destination = "$HOME/etcd-peer.crt" } provisioner "file" { - content = module.bootkube.etcd_peer_key + content = module.bootstrap.etcd_peer_key destination = "$HOME/etcd-peer.key" } @@ -93,7 +93,7 @@ resource "null_resource" "copy-worker-secrets" { } provisioner "file" { - content = module.bootkube.kubeconfig-kubelet + content = module.bootstrap.kubeconfig-kubelet destination = "$HOME/kubeconfig" } diff --git a/docs/advanced/customization.md b/docs/advanced/customization.md index e4ff1a6a..e9ad8de7 100644 --- a/docs/advanced/customization.md +++ b/docs/advanced/customization.md @@ -147,5 +147,5 @@ module "digital-ocean-nemo" { } ``` -To customize lower-level Kubernetes control plane bootstrapping, see the [poseidon/terraform-render-bootkube](https://github.com/poseidon/terraform-render-bootkube) Terraform module. +To customize low-level Kubernetes control plane bootstrapping, see the [poseidon/terraform-render-bootstrap](https://github.com/poseidon/terraform-render-bootstrap) Terraform module. diff --git a/google-cloud/container-linux/kubernetes/bootkube.tf b/google-cloud/container-linux/kubernetes/bootkube.tf index 4ad35381..d3c81bf0 100644 --- a/google-cloud/container-linux/kubernetes/bootkube.tf +++ b/google-cloud/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) -module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=6e59af71138bc5f784453873074de16e7ee150eb" +module "bootstrap" { + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=6e59af71138bc5f784453873074de16e7ee150eb" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/google-cloud/container-linux/kubernetes/controllers.tf b/google-cloud/container-linux/kubernetes/controllers.tf index 06a921a6..893a324b 100644 --- a/google-cloud/container-linux/kubernetes/controllers.tf +++ b/google-cloud/container-linux/kubernetes/controllers.tf @@ -85,7 +85,7 @@ data "template_file" "controller-configs" { etcd_domain = "${var.cluster_name}-etcd${count.index}.${var.dns_zone}" # etcd0=https://cluster-etcd0.example.com,etcd1=https://cluster-etcd1.example.com,... etcd_initial_cluster = join(",", data.template_file.etcds.*.rendered) - kubeconfig = indent(10, module.bootkube.kubeconfig-kubelet) + kubeconfig = indent(10, module.bootstrap.kubeconfig-kubelet) ssh_authorized_key = var.ssh_authorized_key cluster_dns_service_ip = cidrhost(var.service_cidr, 10) cluster_domain_suffix = var.cluster_domain_suffix diff --git a/google-cloud/container-linux/kubernetes/outputs.tf b/google-cloud/container-linux/kubernetes/outputs.tf index 5c6c889b..0de72502 100644 --- a/google-cloud/container-linux/kubernetes/outputs.tf +++ b/google-cloud/container-linux/kubernetes/outputs.tf @@ -1,5 +1,5 @@ output "kubeconfig-admin" { - value = module.bootkube.kubeconfig-admin + value = module.bootstrap.kubeconfig-admin } # Outputs for Kubernetes Ingress @@ -21,7 +21,7 @@ output "network_name" { } output "kubeconfig" { - value = module.bootkube.kubeconfig-kubelet + value = module.bootstrap.kubeconfig-kubelet } # Outputs for custom firewalling diff --git a/google-cloud/container-linux/kubernetes/ssh.tf b/google-cloud/container-linux/kubernetes/ssh.tf index f0e10134..b4229674 100644 --- a/google-cloud/container-linux/kubernetes/ssh.tf +++ b/google-cloud/container-linux/kubernetes/ssh.tf @@ -3,7 +3,7 @@ resource "null_resource" "copy-controller-secrets" { count = var.controller_count depends_on = [ - module.bootkube, + module.bootstrap, ] connection { @@ -14,37 +14,37 @@ resource "null_resource" "copy-controller-secrets" { } provisioner "file" { - content = module.bootkube.etcd_ca_cert + content = module.bootstrap.etcd_ca_cert destination = "$HOME/etcd-client-ca.crt" } provisioner "file" { - content = module.bootkube.etcd_client_cert + content = module.bootstrap.etcd_client_cert destination = "$HOME/etcd-client.crt" } provisioner "file" { - content = module.bootkube.etcd_client_key + content = module.bootstrap.etcd_client_key destination = "$HOME/etcd-client.key" } provisioner "file" { - content = module.bootkube.etcd_server_cert + content = module.bootstrap.etcd_server_cert destination = "$HOME/etcd-server.crt" } provisioner "file" { - content = module.bootkube.etcd_server_key + content = module.bootstrap.etcd_server_key destination = "$HOME/etcd-server.key" } provisioner "file" { - content = module.bootkube.etcd_peer_cert + content = module.bootstrap.etcd_peer_cert destination = "$HOME/etcd-peer.crt" } provisioner "file" { - content = module.bootkube.etcd_peer_key + content = module.bootstrap.etcd_peer_key destination = "$HOME/etcd-peer.key" } diff --git a/google-cloud/container-linux/kubernetes/workers.tf b/google-cloud/container-linux/kubernetes/workers.tf index 0c76ae71..eef18668 100644 --- a/google-cloud/container-linux/kubernetes/workers.tf +++ b/google-cloud/container-linux/kubernetes/workers.tf @@ -13,7 +13,7 @@ module "workers" { preemptible = var.worker_preemptible # configuration - kubeconfig = module.bootkube.kubeconfig-kubelet + kubeconfig = module.bootstrap.kubeconfig-kubelet ssh_authorized_key = var.ssh_authorized_key service_cidr = var.service_cidr cluster_domain_suffix = var.cluster_domain_suffix