CadolesKube/typhoon
7
0
Fork 0
mirror of https://github.com/puppetmaster/typhoon.git synced 2025-07-05 07:54:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename bootkube modules to bootstrap

Browse Source 
* 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
This commit is contained in:
Dalton Hubble
2019-09-14 16:24:32 -07:00
parent b15c60fa2f
commit 96b646cf6d
32 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
aws/container-linux/kubernetes/bootkube.tf
View File

@ -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)]

2
aws/container-linux/kubernetes/controllers.tf
View File

@ -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

4
aws/container-linux/kubernetes/outputs.tf
View File

@ -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

16
aws/container-linux/kubernetes/ssh.tf
View File

@ -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"
}

2
aws/container-linux/kubernetes/workers.tf
View File

@ -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