diff --git a/assets.tf b/assets.tf index 01d375c..d392f7c 100644 --- a/assets.tf +++ b/assets.tf @@ -30,7 +30,7 @@ resource "template_dir" "manifests" { cloud_provider = "${var.cloud_provider}" pod_cidr = "${var.pod_cidr}" service_cidr = "${var.service_cidr}" - cluster_dns_fqdn = "${var.cluster_dns_fqdn}" + cluster_domain_suffix = "${var.cluster_domain_suffix}" kube_dns_service_ip = "${cidrhost(var.service_cidr, 10)}" ca_cert = "${base64encode(var.ca_certificate == "" ? join(" ", tls_self_signed_cert.kube-ca.*.cert_pem) : var.ca_certificate)}" diff --git a/resources/manifests/kube-dns-deployment.yaml b/resources/manifests/kube-dns-deployment.yaml index af97737..3e31e89 100644 --- a/resources/manifests/kube-dns-deployment.yaml +++ b/resources/manifests/kube-dns-deployment.yaml @@ -67,7 +67,7 @@ spec: initialDelaySeconds: 3 timeoutSeconds: 5 args: - - --domain=${cluster_dns_fqdn}. + - --domain=${cluster_domain_suffix}. - --dns-port=10053 - --config-dir=/kube-dns-config - --v=2 @@ -108,7 +108,7 @@ spec: - --cache-size=1000 - --no-negcache - --log-facility=- - - --server=/${cluster_dns_fqdn}/127.0.0.1#10053 + - --server=/${cluster_domain_suffix}/127.0.0.1#10053 - --server=/in-addr.arpa/127.0.0.1#10053 - --server=/ip6.arpa/127.0.0.1#10053 ports: @@ -140,8 +140,8 @@ spec: args: - --v=2 - --logtostderr - - --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.${cluster_dns_fqdn},5,A - - --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.${cluster_dns_fqdn},5,A + - --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.${cluster_domain_suffix},5,A + - --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.${cluster_domain_suffix},5,A ports: - containerPort: 10054 name: metrics diff --git a/tls-k8s.tf b/tls-k8s.tf index be53f03..0f92238 100644 --- a/tls-k8s.tf +++ b/tls-k8s.tf @@ -70,7 +70,7 @@ resource "tls_cert_request" "apiserver" { "kubernetes", "kubernetes.default", "kubernetes.default.svc", - "kubernetes.default.svc.${var.cluster_dns_fqdn}", + "kubernetes.default.svc.${var.cluster_domain_suffix}", ] ip_addresses = [ diff --git a/variables.tf b/variables.tf index e6bd72d..060236f 100644 --- a/variables.tf +++ b/variables.tf @@ -52,8 +52,8 @@ EOD default = "10.3.0.0/24" } -variable "cluster_dns_fqdn" { - description = "The FQDN base to use for DNS within the cluster (eg, KubeDNS)" +variable "cluster_domain_suffix" { + description = "Queries for domains with the suffix will be answered by kube-dns" type = "string" default = "cluster.local" }