From 98985e5acdf04c7a7ed5578ca722f57f9670f70e Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Mon, 26 Feb 2018 22:20:20 -0800 Subject: [PATCH] Remove unused etcd_service_ip template variable * etcd_service_ip dates back to deprecated self-hosted etcd --- aws/container-linux/kubernetes/workers.tf | 7 +++---- bare-metal/container-linux/pxe-worker/groups.tf | 3 --- digital-ocean/container-linux/kubernetes/workers.tf | 1 - google-cloud/container-linux/kubernetes/workers/workers.tf | 7 +++---- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/aws/container-linux/kubernetes/workers.tf b/aws/container-linux/kubernetes/workers.tf index fbf5ef92..e734da2d 100644 --- a/aws/container-linux/kubernetes/workers.tf +++ b/aws/container-linux/kubernetes/workers.tf @@ -61,11 +61,10 @@ data "template_file" "worker_config" { template = "${file("${path.module}/cl/worker.yaml.tmpl")}" vars = { - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - k8s_etcd_service_ip = "${cidrhost(var.service_cidr, 15)}" - ssh_authorized_key = "${var.ssh_authorized_key}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" kubeconfig = "${indent(10, module.bootkube.kubeconfig)}" + ssh_authorized_key = "${var.ssh_authorized_key}" + k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" + cluster_domain_suffix = "${var.cluster_domain_suffix}" } } diff --git a/bare-metal/container-linux/pxe-worker/groups.tf b/bare-metal/container-linux/pxe-worker/groups.tf index 6b90585e..1743f987 100644 --- a/bare-metal/container-linux/pxe-worker/groups.tf +++ b/bare-metal/container-linux/pxe-worker/groups.tf @@ -12,9 +12,6 @@ resource "matchbox_group" "workers" { domain_name = "${element(var.worker_domains, count.index)}" etcd_endpoints = "${join(",", formatlist("%s:2379", var.controller_domains))}" - # TODO - etcd_on_host = "true" - k8s_etcd_service_ip = "10.3.0.15" k8s_dns_service_ip = "${var.kube_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/workers.tf b/digital-ocean/container-linux/kubernetes/workers.tf index 4e2c67ec..a3a3bdda 100644 --- a/digital-ocean/container-linux/kubernetes/workers.tf +++ b/digital-ocean/container-linux/kubernetes/workers.tf @@ -44,7 +44,6 @@ data "template_file" "worker_config" { vars = { k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - k8s_etcd_service_ip = "${cidrhost(var.service_cidr, 15)}" cluster_domain_suffix = "${var.cluster_domain_suffix}" } } diff --git a/google-cloud/container-linux/kubernetes/workers/workers.tf b/google-cloud/container-linux/kubernetes/workers/workers.tf index 77ffd03f..8afea90a 100644 --- a/google-cloud/container-linux/kubernetes/workers/workers.tf +++ b/google-cloud/container-linux/kubernetes/workers/workers.tf @@ -22,11 +22,10 @@ data "template_file" "worker_config" { template = "${file("${path.module}/cl/worker.yaml.tmpl")}" vars = { - k8s_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" - k8s_etcd_service_ip = "${cidrhost(var.service_cidr, 15)}" - cluster_domain_suffix = "${var.cluster_domain_suffix}" - ssh_authorized_key = "${var.ssh_authorized_key}" 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}" } }