From b57273b6f1e88d6db709d7bfb96df19250427e85 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 5 Jan 2019 13:32:03 -0800 Subject: [PATCH] Rename internal kube_dns_service_ip to cluster_dns_service_ip * terraform-render-bootkube module deprecated kube_dns_service_ip output in favor of cluster_dns_service_ip * Rename k8s_dns_service_ip to cluster_dns_service_ip for consistency too --- aws/container-linux/kubernetes/bootkube.tf | 2 +- .../kubernetes/cl/controller.yaml.tmpl | 2 +- aws/container-linux/kubernetes/controllers.tf | 8 ++++---- .../kubernetes/workers/cl/worker.yaml.tmpl | 2 +- .../kubernetes/workers/workers.tf | 8 ++++---- aws/fedora-atomic/kubernetes/bootkube.tf | 2 +- .../kubernetes/cloudinit/controller.yaml.tmpl | 2 +- aws/fedora-atomic/kubernetes/controllers.tf | 8 ++++---- .../workers/cloudinit/worker.yaml.tmpl | 2 +- .../kubernetes/workers/workers.tf | 8 ++++---- azure/container-linux/kubernetes/bootkube.tf | 2 +- .../kubernetes/cl/controller.yaml.tmpl | 2 +- .../container-linux/kubernetes/controllers.tf | 8 ++++---- .../kubernetes/workers/cl/worker.yaml.tmpl | 2 +- .../kubernetes/workers/workers.tf | 8 ++++---- .../container-linux/kubernetes/bootkube.tf | 2 +- .../kubernetes/cl/controller.yaml.tmpl | 2 +- .../kubernetes/cl/worker.yaml.tmpl | 2 +- .../container-linux/kubernetes/profiles.tf | 20 +++++++++---------- .../fedora-atomic/kubernetes/bootkube.tf | 2 +- .../kubernetes/cloudinit/controller.yaml.tmpl | 2 +- .../kubernetes/cloudinit/worker.yaml.tmpl | 2 +- .../fedora-atomic/kubernetes/outputs.tf | 1 - .../fedora-atomic/kubernetes/profiles.tf | 20 +++++++++---------- .../container-linux/kubernetes/bootkube.tf | 2 +- .../kubernetes/cl/controller.yaml.tmpl | 2 +- .../kubernetes/cl/worker.yaml.tmpl | 2 +- .../container-linux/kubernetes/controllers.tf | 6 +++--- .../container-linux/kubernetes/workers.tf | 4 ++-- .../fedora-atomic/kubernetes/bootkube.tf | 2 +- .../kubernetes/cloudinit/controller.yaml.tmpl | 2 +- .../kubernetes/cloudinit/worker.yaml.tmpl | 2 +- .../fedora-atomic/kubernetes/controllers.tf | 6 +++--- .../fedora-atomic/kubernetes/workers.tf | 6 +++--- .../container-linux/kubernetes/bootkube.tf | 2 +- .../kubernetes/cl/controller.yaml.tmpl | 2 +- .../container-linux/kubernetes/controllers.tf | 8 ++++---- .../kubernetes/workers/cl/worker.yaml.tmpl | 2 +- .../kubernetes/workers/workers.tf | 8 ++++---- .../fedora-atomic/kubernetes/bootkube.tf | 2 +- .../kubernetes/cloudinit/controller.yaml.tmpl | 2 +- .../fedora-atomic/kubernetes/controllers.tf | 8 ++++---- .../workers/cloudinit/worker.yaml.tmpl | 2 +- .../kubernetes/workers/workers.tf | 8 ++++---- 44 files changed, 98 insertions(+), 99 deletions(-) diff --git a/aws/container-linux/kubernetes/bootkube.tf b/aws/container-linux/kubernetes/bootkube.tf index eb691b9d..dcc92bfd 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=a7bd306679a0ce8a9e5084f928af696a284a256b" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=3431a12ac12f8eb284bd04d32c668ce533165c18" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl index 4c1bd36c..9c8812d3 100644 --- a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -78,7 +78,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --client-ca-file=/etc/kubernetes/ca.crt \ - --cluster_dns=${k8s_dns_service_ip} \ + --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ --exit-on-lock-contention \ diff --git a/aws/container-linux/kubernetes/controllers.tf b/aws/container-linux/kubernetes/controllers.tf index 5962ee47..d43e495b 100644 --- a/aws/container-linux/kubernetes/controllers.tf +++ b/aws/container-linux/kubernetes/controllers.tf @@ -68,10 +68,10 @@ 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)}" - kubeconfig = "${indent(10, module.bootkube.kubeconfig-kubelet)}" - ssh_authorized_key = "${var.ssh_authorized_key}" - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" + kubeconfig = "${indent(10, module.bootkube.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/workers/cl/worker.yaml.tmpl b/aws/container-linux/kubernetes/workers/cl/worker.yaml.tmpl index 8ef264b8..eed8662f 100644 --- a/aws/container-linux/kubernetes/workers/cl/worker.yaml.tmpl +++ b/aws/container-linux/kubernetes/workers/cl/worker.yaml.tmpl @@ -51,7 +51,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --client-ca-file=/etc/kubernetes/ca.crt \ - --cluster_dns=${k8s_dns_service_ip} \ + --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ --exit-on-lock-contention \ diff --git a/aws/container-linux/kubernetes/workers/workers.tf b/aws/container-linux/kubernetes/workers/workers.tf index 4b676232..2e1dbbfe 100644 --- a/aws/container-linux/kubernetes/workers/workers.tf +++ b/aws/container-linux/kubernetes/workers/workers.tf @@ -77,9 +77,9 @@ data "template_file" "worker-config" { template = "${file("${path.module}/cl/worker.yaml.tmpl")}" vars = { - kubeconfig = "${indent(10, var.kubeconfig)}" - ssh_authorized_key = "${var.ssh_authorized_key}" - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" + kubeconfig = "${indent(10, var.kubeconfig)}" + 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-atomic/kubernetes/bootkube.tf b/aws/fedora-atomic/kubernetes/bootkube.tf index 62312a4d..52f06f37 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=a7bd306679a0ce8a9e5084f928af696a284a256b" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=3431a12ac12f8eb284bd04d32c668ce533165c18" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index 9b45fa69..effa38e1 100644 --- a/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/aws/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -40,7 +40,7 @@ write_files: --authentication-token-webhook \ --authorization-mode=Webhook \ --client-ca-file=/etc/kubernetes/ca.crt \ - --cluster_dns=${k8s_dns_service_ip} \ + --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ --exit-on-lock-contention \ diff --git a/aws/fedora-atomic/kubernetes/controllers.tf b/aws/fedora-atomic/kubernetes/controllers.tf index 8632910a..939c4d49 100644 --- a/aws/fedora-atomic/kubernetes/controllers.tf +++ b/aws/fedora-atomic/kubernetes/controllers.tf @@ -60,10 +60,10 @@ data "template_file" "controller-cloudinit" { # etcd0=https://cluster-etcd0.example.com,etcd1=https://cluster-etcd1.example.com,... etcd_initial_cluster = "${join(",", data.template_file.etcds.*.rendered)}" - kubeconfig = "${indent(6, module.bootkube.kubeconfig-kubelet)}" - ssh_authorized_key = "${var.ssh_authorized_key}" - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" + kubeconfig = "${indent(6, module.bootkube.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-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl b/aws/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl index 9a6bf57c..e3af462b 100644 --- a/aws/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl +++ b/aws/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl @@ -19,7 +19,7 @@ write_files: --authentication-token-webhook \ --authorization-mode=Webhook \ --client-ca-file=/etc/kubernetes/ca.crt \ - --cluster_dns=${k8s_dns_service_ip} \ + --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ --exit-on-lock-contention \ diff --git a/aws/fedora-atomic/kubernetes/workers/workers.tf b/aws/fedora-atomic/kubernetes/workers/workers.tf index 77832f7e..1f66e09d 100644 --- a/aws/fedora-atomic/kubernetes/workers/workers.tf +++ b/aws/fedora-atomic/kubernetes/workers/workers.tf @@ -70,9 +70,9 @@ data "template_file" "worker-cloudinit" { template = "${file("${path.module}/cloudinit/worker.yaml.tmpl")}" vars = { - kubeconfig = "${indent(6, var.kubeconfig)}" - ssh_authorized_key = "${var.ssh_authorized_key}" - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" + kubeconfig = "${indent(6, var.kubeconfig)}" + 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/bootkube.tf b/azure/container-linux/kubernetes/bootkube.tf index fdf4ed5c..baf392ba 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=a7bd306679a0ce8a9e5084f928af696a284a256b" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=3431a12ac12f8eb284bd04d32c668ce533165c18" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/azure/container-linux/kubernetes/cl/controller.yaml.tmpl b/azure/container-linux/kubernetes/cl/controller.yaml.tmpl index 4c1bd36c..9c8812d3 100644 --- a/azure/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/azure/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -78,7 +78,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --client-ca-file=/etc/kubernetes/ca.crt \ - --cluster_dns=${k8s_dns_service_ip} \ + --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ --exit-on-lock-contention \ diff --git a/azure/container-linux/kubernetes/controllers.tf b/azure/container-linux/kubernetes/controllers.tf index 057cc407..b929b778 100644 --- a/azure/container-linux/kubernetes/controllers.tf +++ b/azure/container-linux/kubernetes/controllers.tf @@ -149,10 +149,10 @@ 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)}" - kubeconfig = "${indent(10, module.bootkube.kubeconfig-kubelet)}" - ssh_authorized_key = "${var.ssh_authorized_key}" - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" + kubeconfig = "${indent(10, module.bootkube.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/workers/cl/worker.yaml.tmpl b/azure/container-linux/kubernetes/workers/cl/worker.yaml.tmpl index 7fd9c918..6d1d0e06 100644 --- a/azure/container-linux/kubernetes/workers/cl/worker.yaml.tmpl +++ b/azure/container-linux/kubernetes/workers/cl/worker.yaml.tmpl @@ -51,7 +51,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --client-ca-file=/etc/kubernetes/ca.crt \ - --cluster_dns=${k8s_dns_service_ip} \ + --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ --exit-on-lock-contention \ diff --git a/azure/container-linux/kubernetes/workers/workers.tf b/azure/container-linux/kubernetes/workers/workers.tf index ba0ded97..a929d565 100644 --- a/azure/container-linux/kubernetes/workers/workers.tf +++ b/azure/container-linux/kubernetes/workers/workers.tf @@ -106,9 +106,9 @@ data "template_file" "worker-config" { template = "${file("${path.module}/cl/worker.yaml.tmpl")}" vars = { - kubeconfig = "${indent(10, var.kubeconfig)}" - ssh_authorized_key = "${var.ssh_authorized_key}" - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" + kubeconfig = "${indent(10, var.kubeconfig)}" + 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/bare-metal/container-linux/kubernetes/bootkube.tf b/bare-metal/container-linux/kubernetes/bootkube.tf index 00815ded..fb20be0d 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=a7bd306679a0ce8a9e5084f928af696a284a256b" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=3431a12ac12f8eb284bd04d32c668ce533165c18" cluster_name = "${var.cluster_name}" api_servers = ["${var.k8s_domain_name}"] diff --git a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl index 9bf75fcd..1755a5bb 100644 --- a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -90,7 +90,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --client-ca-file=/etc/kubernetes/ca.crt \ - --cluster_dns=${k8s_dns_service_ip} \ + --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ --exit-on-lock-contention \ diff --git a/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl b/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl index 9918d7fe..85f80f15 100644 --- a/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl +++ b/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl @@ -63,7 +63,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --client-ca-file=/etc/kubernetes/ca.crt \ - --cluster_dns=${k8s_dns_service_ip} \ + --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ --exit-on-lock-contention \ diff --git a/bare-metal/container-linux/kubernetes/profiles.tf b/bare-metal/container-linux/kubernetes/profiles.tf index 1b95bb55..4b576efe 100644 --- a/bare-metal/container-linux/kubernetes/profiles.tf +++ b/bare-metal/container-linux/kubernetes/profiles.tf @@ -160,12 +160,12 @@ data "template_file" "controller-configs" { template = "${file("${path.module}/cl/controller.yaml.tmpl")}" vars { - domain_name = "${element(var.controller_domains, count.index)}" - etcd_name = "${element(var.controller_names, count.index)}" - etcd_initial_cluster = "${join(",", formatlist("%s=https://%s:2380", var.controller_names, var.controller_domains))}" - k8s_dns_service_ip = "${module.bootkube.kube_dns_service_ip}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" - ssh_authorized_key = "${var.ssh_authorized_key}" + domain_name = "${element(var.controller_domains, count.index)}" + etcd_name = "${element(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_domain_suffix = "${var.cluster_domain_suffix}" + ssh_authorized_key = "${var.ssh_authorized_key}" } } @@ -191,10 +191,10 @@ data "template_file" "worker-configs" { template = "${file("${path.module}/cl/worker.yaml.tmpl")}" vars { - domain_name = "${element(var.worker_domains, count.index)}" - k8s_dns_service_ip = "${module.bootkube.kube_dns_service_ip}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" - ssh_authorized_key = "${var.ssh_authorized_key}" + domain_name = "${element(var.worker_domains, count.index)}" + cluster_dns_service_ip = "${module.bootkube.cluster_dns_service_ip}" + cluster_domain_suffix = "${var.cluster_domain_suffix}" + ssh_authorized_key = "${var.ssh_authorized_key}" } } diff --git a/bare-metal/fedora-atomic/kubernetes/bootkube.tf b/bare-metal/fedora-atomic/kubernetes/bootkube.tf index 729b5f41..6be57c37 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=a7bd306679a0ce8a9e5084f928af696a284a256b" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=3431a12ac12f8eb284bd04d32c668ce533165c18" cluster_name = "${var.cluster_name}" api_servers = ["${var.k8s_domain_name}"] diff --git a/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index 2f594e42..453620cb 100644 --- a/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/bare-metal/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -40,7 +40,7 @@ write_files: --authentication-token-webhook \ --authorization-mode=Webhook \ --client-ca-file=/etc/kubernetes/ca.crt \ - --cluster_dns=${k8s_dns_service_ip} \ + --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ --exit-on-lock-contention \ diff --git a/bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl b/bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl index 3738dfdb..a3d23952 100644 --- a/bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl +++ b/bare-metal/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl @@ -19,7 +19,7 @@ write_files: --authentication-token-webhook \ --authorization-mode=Webhook \ --client-ca-file=/etc/kubernetes/ca.crt \ - --cluster_dns=${k8s_dns_service_ip} \ + --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ --exit-on-lock-contention \ diff --git a/bare-metal/fedora-atomic/kubernetes/outputs.tf b/bare-metal/fedora-atomic/kubernetes/outputs.tf index b1e23b10..0ed7e412 100644 --- a/bare-metal/fedora-atomic/kubernetes/outputs.tf +++ b/bare-metal/fedora-atomic/kubernetes/outputs.tf @@ -1,4 +1,3 @@ output "kubeconfig-admin" { value = "${module.bootkube.kubeconfig-admin-context}" } - diff --git a/bare-metal/fedora-atomic/kubernetes/profiles.tf b/bare-metal/fedora-atomic/kubernetes/profiles.tf index bdaf13d3..30aec83c 100644 --- a/bare-metal/fedora-atomic/kubernetes/profiles.tf +++ b/bare-metal/fedora-atomic/kubernetes/profiles.tf @@ -55,12 +55,12 @@ data "template_file" "controller-configs" { template = "${file("${path.module}/cloudinit/controller.yaml.tmpl")}" vars { - domain_name = "${element(var.controller_domains, count.index)}" - etcd_name = "${element(var.controller_names, count.index)}" - etcd_initial_cluster = "${join(",", formatlist("%s=https://%s:2380", var.controller_names, var.controller_domains))}" - k8s_dns_service_ip = "${module.bootkube.kube_dns_service_ip}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" - ssh_authorized_key = "${var.ssh_authorized_key}" + domain_name = "${element(var.controller_domains, count.index)}" + etcd_name = "${element(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_domain_suffix = "${var.cluster_domain_suffix}" + ssh_authorized_key = "${var.ssh_authorized_key}" } } @@ -79,9 +79,9 @@ data "template_file" "worker-configs" { template = "${file("${path.module}/cloudinit/worker.yaml.tmpl")}" vars { - domain_name = "${element(var.worker_domains, count.index)}" - k8s_dns_service_ip = "${module.bootkube.kube_dns_service_ip}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" - ssh_authorized_key = "${var.ssh_authorized_key}" + domain_name = "${element(var.worker_domains, count.index)}" + cluster_dns_service_ip = "${module.bootkube.cluster_dns_service_ip}" + cluster_domain_suffix = "${var.cluster_domain_suffix}" + ssh_authorized_key = "${var.ssh_authorized_key}" } } diff --git a/digital-ocean/container-linux/kubernetes/bootkube.tf b/digital-ocean/container-linux/kubernetes/bootkube.tf index 5a9eb641..0e465b49 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=a7bd306679a0ce8a9e5084f928af696a284a256b" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=3431a12ac12f8eb284bd04d32c668ce533165c18" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl index 6628b0ff..72524d10 100644 --- a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -86,7 +86,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --client-ca-file=/etc/kubernetes/ca.crt \ - --cluster_dns=${k8s_dns_service_ip} \ + --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ --exit-on-lock-contention \ diff --git a/digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl b/digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl index 0ebf78b7..ca5d0f4a 100644 --- a/digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl +++ b/digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl @@ -59,7 +59,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --client-ca-file=/etc/kubernetes/ca.crt \ - --cluster_dns=${k8s_dns_service_ip} \ + --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ --exit-on-lock-contention \ diff --git a/digital-ocean/container-linux/kubernetes/controllers.tf b/digital-ocean/container-linux/kubernetes/controllers.tf index ea38ebfb..fadaf920 100644 --- a/digital-ocean/container-linux/kubernetes/controllers.tf +++ b/digital-ocean/container-linux/kubernetes/controllers.tf @@ -83,9 +83,9 @@ 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)}" - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" + etcd_initial_cluster = "${join(",", data.template_file.etcds.*.rendered)}" + cluster_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" + cluster_domain_suffix = "${var.cluster_domain_suffix}" } } diff --git a/digital-ocean/container-linux/kubernetes/workers.tf b/digital-ocean/container-linux/kubernetes/workers.tf index 1542687c..dfa96908 100644 --- a/digital-ocean/container-linux/kubernetes/workers.tf +++ b/digital-ocean/container-linux/kubernetes/workers.tf @@ -66,7 +66,7 @@ data "template_file" "worker-config" { template = "${file("${path.module}/cl/worker.yaml.tmpl")}" vars = { - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" + cluster_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" + cluster_domain_suffix = "${var.cluster_domain_suffix}" } } diff --git a/digital-ocean/fedora-atomic/kubernetes/bootkube.tf b/digital-ocean/fedora-atomic/kubernetes/bootkube.tf index 6c92ca5b..f7114076 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=a7bd306679a0ce8a9e5084f928af696a284a256b" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=3431a12ac12f8eb284bd04d32c668ce533165c18" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index 84c609e7..b3a9970f 100644 --- a/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/digital-ocean/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -40,7 +40,7 @@ write_files: --authentication-token-webhook \ --authorization-mode=Webhook \ --client-ca-file=/etc/kubernetes/ca.crt \ - --cluster_dns=${k8s_dns_service_ip} \ + --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ --exit-on-lock-contention \ diff --git a/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl b/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl index 8daca190..e61015b4 100644 --- a/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl +++ b/digital-ocean/fedora-atomic/kubernetes/cloudinit/worker.yaml.tmpl @@ -19,7 +19,7 @@ write_files: --authentication-token-webhook \ --authorization-mode=Webhook \ --client-ca-file=/etc/kubernetes/ca.crt \ - --cluster_dns=${k8s_dns_service_ip} \ + --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ --exit-on-lock-contention \ diff --git a/digital-ocean/fedora-atomic/kubernetes/controllers.tf b/digital-ocean/fedora-atomic/kubernetes/controllers.tf index 6fa15a09..19a95041 100644 --- a/digital-ocean/fedora-atomic/kubernetes/controllers.tf +++ b/digital-ocean/fedora-atomic/kubernetes/controllers.tf @@ -77,9 +77,9 @@ data "template_file" "controller-cloudinit" { # etcd0=https://cluster-etcd0.example.com,etcd1=https://cluster-etcd1.example.com,... etcd_initial_cluster = "${join(",", data.template_file.etcds.*.rendered)}" - ssh_authorized_key = "${var.ssh_authorized_key}" - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" + 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/digital-ocean/fedora-atomic/kubernetes/workers.tf b/digital-ocean/fedora-atomic/kubernetes/workers.tf index 3e2543d1..6ba5cb57 100644 --- a/digital-ocean/fedora-atomic/kubernetes/workers.tf +++ b/digital-ocean/fedora-atomic/kubernetes/workers.tf @@ -59,8 +59,8 @@ data "template_file" "worker-cloudinit" { template = "${file("${path.module}/cloudinit/worker.yaml.tmpl")}" vars = { - ssh_authorized_key = "${var.ssh_authorized_key}" - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" + 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/bootkube.tf b/google-cloud/container-linux/kubernetes/bootkube.tf index f4564eef..2269df20 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=a7bd306679a0ce8a9e5084f928af696a284a256b" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=3431a12ac12f8eb284bd04d32c668ce533165c18" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl b/google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl index bdba3e8c..9f92b714 100644 --- a/google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/google-cloud/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -79,7 +79,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --client-ca-file=/etc/kubernetes/ca.crt \ - --cluster_dns=${k8s_dns_service_ip} \ + --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ --exit-on-lock-contention \ diff --git a/google-cloud/container-linux/kubernetes/controllers.tf b/google-cloud/container-linux/kubernetes/controllers.tf index 364d8c0c..1a6ff048 100644 --- a/google-cloud/container-linux/kubernetes/controllers.tf +++ b/google-cloud/container-linux/kubernetes/controllers.tf @@ -87,10 +87,10 @@ 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)}" - kubeconfig = "${indent(10, module.bootkube.kubeconfig-kubelet)}" - ssh_authorized_key = "${var.ssh_authorized_key}" - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" + kubeconfig = "${indent(10, module.bootkube.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/workers/cl/worker.yaml.tmpl b/google-cloud/container-linux/kubernetes/workers/cl/worker.yaml.tmpl index 00177574..aacf6e92 100644 --- a/google-cloud/container-linux/kubernetes/workers/cl/worker.yaml.tmpl +++ b/google-cloud/container-linux/kubernetes/workers/cl/worker.yaml.tmpl @@ -52,7 +52,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --client-ca-file=/etc/kubernetes/ca.crt \ - --cluster_dns=${k8s_dns_service_ip} \ + --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ --exit-on-lock-contention \ diff --git a/google-cloud/container-linux/kubernetes/workers/workers.tf b/google-cloud/container-linux/kubernetes/workers/workers.tf index 8a8d32ee..511f1128 100644 --- a/google-cloud/container-linux/kubernetes/workers/workers.tf +++ b/google-cloud/container-linux/kubernetes/workers/workers.tf @@ -76,9 +76,9 @@ data "template_file" "worker-config" { template = "${file("${path.module}/cl/worker.yaml.tmpl")}" vars = { - kubeconfig = "${indent(10, var.kubeconfig)}" - ssh_authorized_key = "${var.ssh_authorized_key}" - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" + kubeconfig = "${indent(10, var.kubeconfig)}" + 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/fedora-atomic/kubernetes/bootkube.tf b/google-cloud/fedora-atomic/kubernetes/bootkube.tf index 814107de..62a9e352 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=a7bd306679a0ce8a9e5084f928af696a284a256b" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=3431a12ac12f8eb284bd04d32c668ce533165c18" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl b/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl index 9b45fa69..effa38e1 100644 --- a/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl +++ b/google-cloud/fedora-atomic/kubernetes/cloudinit/controller.yaml.tmpl @@ -40,7 +40,7 @@ write_files: --authentication-token-webhook \ --authorization-mode=Webhook \ --client-ca-file=/etc/kubernetes/ca.crt \ - --cluster_dns=${k8s_dns_service_ip} \ + --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ --exit-on-lock-contention \ diff --git a/google-cloud/fedora-atomic/kubernetes/controllers.tf b/google-cloud/fedora-atomic/kubernetes/controllers.tf index 5ce6cb66..f3d40a0a 100644 --- a/google-cloud/fedora-atomic/kubernetes/controllers.tf +++ b/google-cloud/fedora-atomic/kubernetes/controllers.tf @@ -79,10 +79,10 @@ data "template_file" "controller-cloudinit" { # etcd0=https://cluster-etcd0.example.com,etcd1=https://cluster-etcd1.example.com,... etcd_initial_cluster = "${join(",", data.template_file.etcds.*.rendered)}" - kubeconfig = "${indent(6, module.bootkube.kubeconfig-kubelet)}" - ssh_authorized_key = "${var.ssh_authorized_key}" - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" + kubeconfig = "${indent(6, module.bootkube.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/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl b/google-cloud/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl index 9a6bf57c..e3af462b 100644 --- a/google-cloud/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl +++ b/google-cloud/fedora-atomic/kubernetes/workers/cloudinit/worker.yaml.tmpl @@ -19,7 +19,7 @@ write_files: --authentication-token-webhook \ --authorization-mode=Webhook \ --client-ca-file=/etc/kubernetes/ca.crt \ - --cluster_dns=${k8s_dns_service_ip} \ + --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ --cni-conf-dir=/etc/kubernetes/cni/net.d \ --exit-on-lock-contention \ diff --git a/google-cloud/fedora-atomic/kubernetes/workers/workers.tf b/google-cloud/fedora-atomic/kubernetes/workers/workers.tf index 46c6a888..08fde627 100644 --- a/google-cloud/fedora-atomic/kubernetes/workers/workers.tf +++ b/google-cloud/fedora-atomic/kubernetes/workers/workers.tf @@ -69,9 +69,9 @@ data "template_file" "worker-cloudinit" { template = "${file("${path.module}/cloudinit/worker.yaml.tmpl")}" vars = { - kubeconfig = "${indent(6, var.kubeconfig)}" - ssh_authorized_key = "${var.ssh_authorized_key}" - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" + kubeconfig = "${indent(6, var.kubeconfig)}" + ssh_authorized_key = "${var.ssh_authorized_key}" + cluster_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" + cluster_domain_suffix = "${var.cluster_domain_suffix}" } }