Merge pull request #128 from kbst/disableingress

pst · web-flow · commit 5ba04b794dcf · 2020-08-25T10:21:54.000+02:00
Add variable to disable the default ingress setup fix #125
diff --git a/aws/_modules/eks/ingress.tf b/aws/_modules/eks/ingress.tf
@@ -1,4 +1,6 @@
 resource "kubernetes_service" "current" {
+  count = var.disable_default_ingress ? 0 : 1
+
   provider = kubernetes.eks
 
   metadata {
@@ -30,36 +32,39 @@ resource "kubernetes_service" "current" {
 }
 
 resource "aws_route53_zone" "current" {
-  name = "${var.metadata_fqdn}."
-}
+  count = var.disable_default_ingress ? 0 : 1
 
-locals {
-  elb_hostname = kubernetes_service.current.load_balancer_ingress[0].hostname
+  name = "${var.metadata_fqdn}."
 }
 
 data "aws_elb_hosted_zone_id" "current" {
+  count = var.disable_default_ingress ? 0 : 1
 }
 
 resource "aws_route53_record" "host" {
-  zone_id = aws_route53_zone.current.zone_id
+  count = var.disable_default_ingress ? 0 : 1
+
+  zone_id = aws_route53_zone.current[0].zone_id
   name    = var.metadata_fqdn
   type    = "A"
 
   alias {
-    name                   = local.elb_hostname
-    zone_id                = data.aws_elb_hosted_zone_id.current.id
+    name                   = kubernetes_service.current[0].load_balancer_ingress[0].hostname
+    zone_id                = data.aws_elb_hosted_zone_id.current[0].id
     evaluate_target_health = true
   }
 }
 
 resource "aws_route53_record" "wildcard" {
-  zone_id = aws_route53_zone.current.zone_id
+  count = var.disable_default_ingress ? 0 : 1
+
+  zone_id = aws_route53_zone.current[0].zone_id
   name    = "*.${var.metadata_fqdn}"
   type    = "A"
 
   alias {
-    name                   = local.elb_hostname
-    zone_id                = data.aws_elb_hosted_zone_id.current.id
+    name                   = kubernetes_service.current[0].load_balancer_ingress[0].hostname
+    zone_id                = data.aws_elb_hosted_zone_id.current[0].id
     evaluate_target_health = true
   }
 }
diff --git a/aws/_modules/eks/outputs.tf b/aws/_modules/eks/outputs.tf
diff --git a/aws/_modules/eks/variables.tf b/aws/_modules/eks/variables.tf
@@ -69,3 +69,8 @@ variable "manifest_path" {
   type        = string
   description = "Path to Kustomize overlay to build."
 }
+
+variable "disable_default_ingress" {
+  type        = bool
+  description = "Whether to disable the default ingress."
+}
diff --git a/aws/cluster/configuration.tf b/aws/cluster/configuration.tf
@@ -33,4 +33,6 @@ locals {
 
   manifest_path_default = "manifests/overlays/${terraform.workspace}"
   manifest_path         = var.manifest_path != null ? var.manifest_path : local.manifest_path_default
+
+  disable_default_ingress = lookup(local.cfg, "disable_default_ingress", false)
 }
diff --git a/aws/cluster/main.tf b/aws/cluster/main.tf
@@ -32,4 +32,6 @@ module "cluster" {
   aws_auth_map_accounts = local.cluster_aws_auth_map_accounts
 
   manifest_path = local.manifest_path
+
+  disable_default_ingress = local.disable_default_ingress
 }
diff --git a/azurerm/_modules/aks/ingress.tf b/azurerm/_modules/aks/ingress.tf
@@ -1,4 +1,6 @@
 resource "azurerm_public_ip" "current" {
+  count = var.disable_default_ingress ? 0 : 1
+
   name                = var.metadata_name
   location            = azurerm_kubernetes_cluster.current.location
   resource_group_name = azurerm_kubernetes_cluster.current.node_resource_group
@@ -10,6 +12,8 @@ resource "azurerm_public_ip" "current" {
 }
 
 resource "kubernetes_service" "current" {
+  count = var.disable_default_ingress ? 0 : 1
+
   provider = kubernetes.aks
 
   metadata {
@@ -19,7 +23,7 @@ resource "kubernetes_service" "current" {
 
   spec {
     type             = "LoadBalancer"
-    load_balancer_ip = azurerm_public_ip.current.ip_address
+    load_balancer_ip = azurerm_public_ip.current[0].ip_address
 
     selector = {
       "kubestack.com/ingress-default" = "true"
@@ -42,28 +46,34 @@ resource "kubernetes_service" "current" {
 }
 
 resource "azurerm_dns_zone" "current" {
+  count = var.disable_default_ingress ? 0 : 1
+
   name                = var.metadata_fqdn
   resource_group_name = data.azurerm_resource_group.current.name
 
   tags = var.metadata_labels
 }
 
 resource "azurerm_dns_a_record" "host" {
+  count = var.disable_default_ingress ? 0 : 1
+
   name                = "@"
-  zone_name           = azurerm_dns_zone.current.name
+  zone_name           = azurerm_dns_zone.current[0].name
   resource_group_name = data.azurerm_resource_group.current.name
   ttl                 = 300
-  records             = [azurerm_public_ip.current.ip_address]
+  records             = [azurerm_public_ip.current[0].ip_address]
 
   tags = var.metadata_labels
 }
 
 resource "azurerm_dns_a_record" "wildcard" {
+  count = var.disable_default_ingress ? 0 : 1
+
   name                = "*"
-  zone_name           = azurerm_dns_zone.current.name
+  zone_name           = azurerm_dns_zone.current[0].name
   resource_group_name = data.azurerm_resource_group.current.name
   ttl                 = 300
-  records             = [azurerm_public_ip.current.ip_address]
+  records             = [azurerm_public_ip.current[0].ip_address]
 
   tags = var.metadata_labels
 }
diff --git a/azurerm/_modules/aks/outputs.tf b/azurerm/_modules/aks/outputs.tf
diff --git a/azurerm/_modules/aks/variables.tf b/azurerm/_modules/aks/variables.tf
@@ -81,3 +81,8 @@ variable "manifest_path" {
   type        = string
   description = "Path to Kustomize overlay to build."
 }
+
+variable "disable_default_ingress" {
+  type        = bool
+  description = "Whether to disable the default ingress."
+}
diff --git a/azurerm/cluster/configuration.tf b/azurerm/cluster/configuration.tf
@@ -31,4 +31,6 @@ locals {
 
   manifest_path_default = "manifests/overlays/${terraform.workspace}"
   manifest_path         = var.manifest_path != null ? var.manifest_path : local.manifest_path_default
+
+  disable_default_ingress = lookup(local.cfg, "disable_default_ingress", false)
 }
diff --git a/azurerm/cluster/main.tf b/azurerm/cluster/main.tf
@@ -39,4 +39,6 @@ module "cluster" {
   default_node_pool_os_disk_size_gb = local.default_node_pool_os_disk_size_gb
 
   manifest_path = local.manifest_path
+
+  disable_default_ingress = local.disable_default_ingress
 }
diff --git a/google/_modules/gke/ingress.tf b/google/_modules/gke/ingress.tf
@@ -1,11 +1,15 @@
 resource "google_compute_address" "current" {
+  count = var.disable_default_ingress ? 0 : 1
+
   region  = google_container_cluster.current.location
   project = var.project
 
   name = var.metadata_name
 }
 
 resource "kubernetes_service" "current" {
+  count = var.disable_default_ingress ? 0 : 1
+
   provider = kubernetes.gke
 
   metadata {
@@ -15,7 +19,7 @@ resource "kubernetes_service" "current" {
 
   spec {
     type             = "LoadBalancer"
-    load_balancer_ip = google_compute_address.current.address
+    load_balancer_ip = google_compute_address.current[0].address
 
     selector = {
       "kubestack.com/ingress-default" = "true"
@@ -39,32 +43,38 @@ resource "kubernetes_service" "current" {
 }
 
 resource "google_dns_managed_zone" "current" {
+  count = var.disable_default_ingress ? 0 : 1
+
   project = var.project
 
   name     = var.metadata_name
   dns_name = "${var.metadata_fqdn}."
 }
 
 resource "google_dns_record_set" "host" {
+  count = var.disable_default_ingress ? 0 : 1
+
   project = var.project
 
-  name = google_dns_managed_zone.current.dns_name
+  name = google_dns_managed_zone.current[0].dns_name
   type = "A"
   ttl  = 300
 
-  managed_zone = google_dns_managed_zone.current.name
+  managed_zone = google_dns_managed_zone.current[0].name
 
-  rrdatas = [google_compute_address.current.address]
+  rrdatas = [google_compute_address.current[0].address]
 }
 
 resource "google_dns_record_set" "wildcard" {
+  count = var.disable_default_ingress ? 0 : 1
+
   project = var.project
 
-  name = "*.${google_dns_managed_zone.current.dns_name}"
+  name = "*.${google_dns_managed_zone.current[0].dns_name}"
   type = "A"
   ttl  = 300
 
-  managed_zone = google_dns_managed_zone.current.name
+  managed_zone = google_dns_managed_zone.current[0].name
 
-  rrdatas = [google_compute_address.current.address]
+  rrdatas = [google_compute_address.current[0].address]
 }
diff --git a/google/_modules/gke/outputs.tf b/google/_modules/gke/outputs.tf
diff --git a/google/_modules/gke/variables.tf b/google/_modules/gke/variables.tf
@@ -108,3 +108,8 @@ variable "manifest_path" {
   type        = string
   description = "Path to Kustomize overlay to build."
 }
+
+variable "disable_default_ingress" {
+  type        = bool
+  description = "Whether to disable the default ingress."
+}
diff --git a/google/cluster/configuration.tf b/google/cluster/configuration.tf
@@ -54,4 +54,6 @@ locals {
 
   manifest_path_default = "manifests/overlays/${terraform.workspace}"
   manifest_path         = var.manifest_path != null ? var.manifest_path : local.manifest_path_default
+
+  disable_default_ingress = lookup(local.cfg, "disable_default_ingress", false)
 }
diff --git a/google/cluster/main.tf b/google/cluster/main.tf
@@ -45,4 +45,6 @@ module "cluster" {
   auto_upgrade = local.cluster_auto_upgrade
 
   manifest_path = local.manifest_path
+
+  disable_default_ingress = local.disable_default_ingress
 }

Original file line number	Diff line number	Diff line change
`@@ -69,3 +69,8 @@ variable "manifest_path" {`
`69`	`69`	`type = string`
`70`	`70`	`description = "Path to Kustomize overlay to build."`
`71`	`71`	`}`
	`72`	`+`
	`73`	`+variable "disable_default_ingress" {`
	`74`	`+ type = bool`
	`75`	`+ description = "Whether to disable the default ingress."`
	`76`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,6 @@ locals {`
`33`	`33`
`34`	`34`	`manifest_path_default = "manifests/overlays/${terraform.workspace}"`
`35`	`35`	`manifest_path = var.manifest_path != null ? var.manifest_path : local.manifest_path_default`
	`36`	`+`
	`37`	`+ disable_default_ingress = lookup(local.cfg, "disable_default_ingress", false)`
`36`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,6 @@ module "cluster" {`
`32`	`32`	`aws_auth_map_accounts = local.cluster_aws_auth_map_accounts`
`33`	`33`
`34`	`34`	`manifest_path = local.manifest_path`
	`35`	`+`
	`36`	`+ disable_default_ingress = local.disable_default_ingress`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,3 +81,8 @@ variable "manifest_path" {`
`81`	`81`	`type = string`
`82`	`82`	`description = "Path to Kustomize overlay to build."`
`83`	`83`	`}`
	`84`	`+`
	`85`	`+variable "disable_default_ingress" {`
	`86`	`+ type = bool`
	`87`	`+ description = "Whether to disable the default ingress."`
	`88`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,6 @@ locals {`
`31`	`31`
`32`	`32`	`manifest_path_default = "manifests/overlays/${terraform.workspace}"`
`33`	`33`	`manifest_path = var.manifest_path != null ? var.manifest_path : local.manifest_path_default`
	`34`	`+`
	`35`	`+ disable_default_ingress = lookup(local.cfg, "disable_default_ingress", false)`
`34`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,4 +39,6 @@ module "cluster" {`
`39`	`39`	`default_node_pool_os_disk_size_gb = local.default_node_pool_os_disk_size_gb`
`40`	`40`
`41`	`41`	`manifest_path = local.manifest_path`
	`42`	`+`
	`43`	`+ disable_default_ingress = local.disable_default_ingress`
`42`	`44`	`}`