modules/tectonic: add kube_dns_service_ip variable

This fixes a regression introduced in coreos#2014.
s-urbaniak · Oct 4, 2017 · 9d54feb · 9d54feb
1 parent 2861140
commit 9d54feb
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 1 deletion.
diff --git a/modules/tectonic/assets.tf b/modules/tectonic/assets.tf
@@ -96,7 +96,8 @@ resource "template_dir" "tectonic" {
     certificates_strategy = "${var.ca_generated == "true" ? "installerGeneratedCA" : "userProvidedCA"}"
     identity_api_service  = "${var.identity_api_service}"
 
-    image_re = "${var.image_re}"
+    image_re            = "${var.image_re}"
+    kube_dns_service_ip = "${cidrhost(var.service_cidr, 10)}"
   }
 }
 

diff --git a/modules/tectonic/variables.tf b/modules/tectonic/variables.tf
@@ -151,3 +151,8 @@ variable "identity_client_cert_pem" {
 variable "identity_client_key_pem" {
   type = "string"
 }
+
+variable "service_cidr" {
+  description = "A CIDR notation IP range from which to assign service cluster IPs"
+  type        = "string"
+}
diff --git a/platforms/aws/tectonic.tf b/platforms/aws/tectonic.tf
@@ -115,6 +115,7 @@ module "tectonic" {
 
   base_address       = "${var.tectonic_aws_private_endpoints ? module.masters.ingress_internal_fqdn : module.masters.ingress_external_fqdn}"
   kube_apiserver_url = "https://${var.tectonic_aws_private_endpoints ? module.masters.api_internal_fqdn : module.masters.api_external_fqdn}:443"
+  service_cidr       = "${var.tectonic_service_cidr}"
 
   # Platform-independent variables wiring, do not modify.
   container_images      = "${var.tectonic_container_images}"

diff --git a/platforms/azure/tectonic.tf b/platforms/azure/tectonic.tf
@@ -100,6 +100,7 @@ module "tectonic" {
 
   base_address       = "${module.vnet.ingress_fqdn}"
   kube_apiserver_url = "https://${module.vnet.api_fqdn}:443"
+  service_cidr       = "${var.tectonic_service_cidr}"
 
   # Platform-independent variables wiring, do not modify.
   container_images      = "${var.tectonic_container_images}"

diff --git a/platforms/gcp/tectonic.tf b/platforms/gcp/tectonic.tf
@@ -115,6 +115,7 @@ module "tectonic" {
 
   base_address       = "${module.dns.kube_ingress_fqdn}"
   kube_apiserver_url = "https://${module.dns.kube_apiserver_fqdn}:443"
+  service_cidr       = "${var.tectonic_service_cidr}"
 
   # Platform-independent variables wiring, do not modify.
   container_images      = "${var.tectonic_container_images}"

diff --git a/platforms/metal/tectonic.tf b/platforms/metal/tectonic.tf
@@ -97,6 +97,7 @@ module "tectonic" {
 
   base_address       = "${var.tectonic_metal_ingress_domain}"
   kube_apiserver_url = "https://${var.tectonic_metal_controller_domain}:443"
+  service_cidr       = "${var.tectonic_service_cidr}"
 
   # Address of the Tectonic console (without protocol)
   container_images      = "${var.tectonic_container_images}"

diff --git a/platforms/openstack/neutron/main.tf b/platforms/openstack/neutron/main.tf
@@ -100,6 +100,7 @@ module "tectonic" {
 
   base_address       = "${var.tectonic_cluster_name}.${var.tectonic_base_domain}"
   kube_apiserver_url = "https://${var.tectonic_cluster_name}-k8s.${var.tectonic_base_domain}:443"
+  service_cidr       = "${var.tectonic_service_cidr}"
 
   # Platform-independent variables wiring, do not modify.
   container_images      = "${var.tectonic_container_images}"

diff --git a/platforms/vmware/tectonic.tf b/platforms/vmware/tectonic.tf
@@ -95,6 +95,7 @@ module "tectonic" {
 
   base_address       = "${var.tectonic_vmware_ingress_domain}"
   kube_apiserver_url = "https://${var.tectonic_vmware_controller_domain}:443"
+  service_cidr       = "${var.tectonic_service_cidr}"
 
   # Platform-independent variables wiring, do not modify.
   container_images      = "${var.tectonic_container_images}"