CadolesKube/typhoon
7
0
Fork 0
mirror of https://github.com/puppetmaster/typhoon.git synced 2025-07-21 02:51:38 +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
bare-metal/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 = [var.k8s_domain_name]

2
bare-metal/container-linux/kubernetes/outputs.tf
View File

@ -1,4 +1,4 @@
output "kubeconfig-admin" {
value = module.bootkube.kubeconfig-admin
value = module.bootstrap.kubeconfig-admin
}

4
bare-metal/container-linux/kubernetes/profiles.tf
View File

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

20
bare-metal/container-linux/kubernetes/ssh.tf
View File

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