From 60c70797ec23bde8c5f03857573faacca2ea731d Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 5 Jan 2019 14:36:55 -0800 Subject: [PATCH] Use a single format of the admin kubeconfig * Use a single admin kubeconfig for initial bootkube bootstrap and for use by a human admin. Previously, an admin kubeconfig without a named context was used for bootstrap and direct usage with KUBECONFIG=path, while one with a named context was used for `kubectl config use-context` style usage. Confusing. * Provide the admin kubeconfig via `assets/auth/kubeconfig`, `assets/auth/CLUSTER-config`, or output `kubeconfig-admin` --- aws/container-linux/kubernetes/bootkube.tf | 2 +- aws/container-linux/kubernetes/outputs.tf | 2 +- aws/fedora-atomic/kubernetes/bootkube.tf | 2 +- aws/fedora-atomic/kubernetes/outputs.tf | 2 +- azure/container-linux/kubernetes/bootkube.tf | 2 +- azure/container-linux/kubernetes/outputs.tf | 2 +- bare-metal/container-linux/kubernetes/bootkube.tf | 2 +- bare-metal/container-linux/kubernetes/outputs.tf | 2 +- bare-metal/fedora-atomic/kubernetes/bootkube.tf | 2 +- bare-metal/fedora-atomic/kubernetes/outputs.tf | 2 +- digital-ocean/container-linux/kubernetes/bootkube.tf | 2 +- digital-ocean/container-linux/kubernetes/outputs.tf | 2 +- digital-ocean/fedora-atomic/kubernetes/bootkube.tf | 2 +- digital-ocean/fedora-atomic/kubernetes/outputs.tf | 2 +- google-cloud/container-linux/kubernetes/bootkube.tf | 2 +- google-cloud/container-linux/kubernetes/outputs.tf | 2 +- google-cloud/fedora-atomic/kubernetes/bootkube.tf | 2 +- google-cloud/fedora-atomic/kubernetes/outputs.tf | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/aws/container-linux/kubernetes/bootkube.tf b/aws/container-linux/kubernetes/bootkube.tf index 7b6f3890..96982825 100644 --- a/aws/container-linux/kubernetes/bootkube.tf +++ b/aws/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=f5ea389e8c86a4de159ae92742b8665a6f8bede0" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=847ec5929b4b4b3d8b922dbbee4a3ecefd71f597" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/aws/container-linux/kubernetes/outputs.tf b/aws/container-linux/kubernetes/outputs.tf index 435d9c14..08c42efc 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-context}" + value = "${module.bootkube.kubeconfig-admin}" } # Outputs for Kubernetes Ingress diff --git a/aws/fedora-atomic/kubernetes/bootkube.tf b/aws/fedora-atomic/kubernetes/bootkube.tf index 3de78c05..5185e4ab 100644 --- a/aws/fedora-atomic/kubernetes/bootkube.tf +++ b/aws/fedora-atomic/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=f5ea389e8c86a4de159ae92742b8665a6f8bede0" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=847ec5929b4b4b3d8b922dbbee4a3ecefd71f597" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/aws/fedora-atomic/kubernetes/outputs.tf b/aws/fedora-atomic/kubernetes/outputs.tf index 435d9c14..08c42efc 100644 --- a/aws/fedora-atomic/kubernetes/outputs.tf +++ b/aws/fedora-atomic/kubernetes/outputs.tf @@ -1,5 +1,5 @@ output "kubeconfig-admin" { - value = "${module.bootkube.kubeconfig-admin-context}" + value = "${module.bootkube.kubeconfig-admin}" } # Outputs for Kubernetes Ingress diff --git a/azure/container-linux/kubernetes/bootkube.tf b/azure/container-linux/kubernetes/bootkube.tf index 453d5202..c6477a3d 100644 --- a/azure/container-linux/kubernetes/bootkube.tf +++ b/azure/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=f5ea389e8c86a4de159ae92742b8665a6f8bede0" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=847ec5929b4b4b3d8b922dbbee4a3ecefd71f597" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/azure/container-linux/kubernetes/outputs.tf b/azure/container-linux/kubernetes/outputs.tf index 03417cf5..75fdfc46 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-context}" + value = "${module.bootkube.kubeconfig-admin}" } # Outputs for Kubernetes Ingress diff --git a/bare-metal/container-linux/kubernetes/bootkube.tf b/bare-metal/container-linux/kubernetes/bootkube.tf index dbd3b6be..68135280 100644 --- a/bare-metal/container-linux/kubernetes/bootkube.tf +++ b/bare-metal/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=f5ea389e8c86a4de159ae92742b8665a6f8bede0" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=847ec5929b4b4b3d8b922dbbee4a3ecefd71f597" 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 0ed7e412..a0977ea3 100644 --- a/bare-metal/container-linux/kubernetes/outputs.tf +++ b/bare-metal/container-linux/kubernetes/outputs.tf @@ -1,3 +1,3 @@ output "kubeconfig-admin" { - value = "${module.bootkube.kubeconfig-admin-context}" + value = "${module.bootkube.kubeconfig-admin}" } diff --git a/bare-metal/fedora-atomic/kubernetes/bootkube.tf b/bare-metal/fedora-atomic/kubernetes/bootkube.tf index 7a12fb53..f50aa763 100644 --- a/bare-metal/fedora-atomic/kubernetes/bootkube.tf +++ b/bare-metal/fedora-atomic/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=f5ea389e8c86a4de159ae92742b8665a6f8bede0" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=847ec5929b4b4b3d8b922dbbee4a3ecefd71f597" cluster_name = "${var.cluster_name}" api_servers = ["${var.k8s_domain_name}"] diff --git a/bare-metal/fedora-atomic/kubernetes/outputs.tf b/bare-metal/fedora-atomic/kubernetes/outputs.tf index 0ed7e412..a0977ea3 100644 --- a/bare-metal/fedora-atomic/kubernetes/outputs.tf +++ b/bare-metal/fedora-atomic/kubernetes/outputs.tf @@ -1,3 +1,3 @@ output "kubeconfig-admin" { - value = "${module.bootkube.kubeconfig-admin-context}" + value = "${module.bootkube.kubeconfig-admin}" } diff --git a/digital-ocean/container-linux/kubernetes/bootkube.tf b/digital-ocean/container-linux/kubernetes/bootkube.tf index ad60f732..8cf4c8d4 100644 --- a/digital-ocean/container-linux/kubernetes/bootkube.tf +++ b/digital-ocean/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=f5ea389e8c86a4de159ae92742b8665a6f8bede0" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=847ec5929b4b4b3d8b922dbbee4a3ecefd71f597" 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 00ea2694..86a4c76a 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.user-kubeconfig}" + value = "${module.bootkube.kubeconfig-admin}" } output "controllers_dns" { diff --git a/digital-ocean/fedora-atomic/kubernetes/bootkube.tf b/digital-ocean/fedora-atomic/kubernetes/bootkube.tf index 244e4852..0f8afb02 100644 --- a/digital-ocean/fedora-atomic/kubernetes/bootkube.tf +++ b/digital-ocean/fedora-atomic/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=f5ea389e8c86a4de159ae92742b8665a6f8bede0" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=847ec5929b4b4b3d8b922dbbee4a3ecefd71f597" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/digital-ocean/fedora-atomic/kubernetes/outputs.tf b/digital-ocean/fedora-atomic/kubernetes/outputs.tf index 00ea2694..86a4c76a 100644 --- a/digital-ocean/fedora-atomic/kubernetes/outputs.tf +++ b/digital-ocean/fedora-atomic/kubernetes/outputs.tf @@ -1,5 +1,5 @@ output "kubeconfig-admin" { - value = "${module.bootkube.user-kubeconfig}" + value = "${module.bootkube.kubeconfig-admin}" } output "controllers_dns" { diff --git a/google-cloud/container-linux/kubernetes/bootkube.tf b/google-cloud/container-linux/kubernetes/bootkube.tf index acc0d681..ae8a9952 100644 --- a/google-cloud/container-linux/kubernetes/bootkube.tf +++ b/google-cloud/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=f5ea389e8c86a4de159ae92742b8665a6f8bede0" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=847ec5929b4b4b3d8b922dbbee4a3ecefd71f597" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/google-cloud/container-linux/kubernetes/outputs.tf b/google-cloud/container-linux/kubernetes/outputs.tf index 408ca607..f1a09ece 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-context}" + value = "${module.bootkube.kubeconfig-admin}" } # Outputs for Kubernetes Ingress diff --git a/google-cloud/fedora-atomic/kubernetes/bootkube.tf b/google-cloud/fedora-atomic/kubernetes/bootkube.tf index 88498df7..378f2cd4 100644 --- a/google-cloud/fedora-atomic/kubernetes/bootkube.tf +++ b/google-cloud/fedora-atomic/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=f5ea389e8c86a4de159ae92742b8665a6f8bede0" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=847ec5929b4b4b3d8b922dbbee4a3ecefd71f597" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/google-cloud/fedora-atomic/kubernetes/outputs.tf b/google-cloud/fedora-atomic/kubernetes/outputs.tf index 408ca607..f1a09ece 100644 --- a/google-cloud/fedora-atomic/kubernetes/outputs.tf +++ b/google-cloud/fedora-atomic/kubernetes/outputs.tf @@ -1,5 +1,5 @@ output "kubeconfig-admin" { - value = "${module.bootkube.kubeconfig-admin-context}" + value = "${module.bootkube.kubeconfig-admin}" } # Outputs for Kubernetes Ingress