diff --git a/modules/base/README.md b/modules/base/README.md index 3cdaaec..0af268b 100644 --- a/modules/base/README.md +++ b/modules/base/README.md @@ -13,7 +13,6 @@ Module that provides the reference architecture. | [azurerm](#requirement\_azurerm) | ~> 3.87 | | [helm](#requirement\_helm) | ~> 2.12 | | [humanitec](#requirement\_humanitec) | ~> 0 | -| [kubernetes](#requirement\_kubernetes) | ~> 2.25 | ## Providers @@ -23,7 +22,6 @@ Module that provides the reference architecture. | [azurerm](#provider\_azurerm) | ~> 3.87 | | [helm](#provider\_helm) | ~> 2.12 | | [humanitec](#provider\_humanitec) | ~> 0 | -| [kubernetes](#provider\_kubernetes) | ~> 2.25 | ## Modules @@ -52,7 +50,6 @@ Module that provides the reference architecture. | [azuread_client_config.current](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/data-sources/client_config) | data source | | [azuread_service_principal.aks](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/data-sources/service_principal) | data source | | [azurerm_subscription.main](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subscription) | data source | -| [kubernetes_service.ingress_nginx_controller](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/data-sources/service) | data source | ## Inputs diff --git a/modules/base/humanitec.tf b/modules/base/humanitec.tf index 4c58a95..494eb9d 100644 --- a/modules/base/humanitec.tf +++ b/modules/base/humanitec.tf @@ -1,9 +1,5 @@ # Humanitec resource definition to connect the cluster to Humanitec -locals { - ingress_address = data.kubernetes_service.ingress_nginx_controller.status[0].load_balancer[0].ingress[0].ip -} - resource "humanitec_resource_definition" "k8s_cluster_driver" { driver_type = "humanitec/k8s-cluster-aks" id = var.cluster_name @@ -12,7 +8,7 @@ resource "humanitec_resource_definition" "k8s_cluster_driver" { driver_inputs = { values_string = jsonencode({ - "loadbalancer" : local.ingress_address + "loadbalancer" : azurerm_public_ip.ingress.ip_address "name" : module.azure_aks.aks_name "resource_group" : azurerm_resource_group.main.name "subscription_id" : var.subscription_id, @@ -35,7 +31,7 @@ resource "humanitec_resource_definition_criteria" "k8s_cluster_driver" { } resource "humanitec_resource_definition" "k8s_namespace" { - driver_type = "humanitec/static" + driver_type = "humanitec/echo" id = "default-namespace" name = "default-namespace" type = "k8s-namespace" diff --git a/modules/base/meta.tf b/modules/base/meta.tf deleted file mode 100644 index fbfc111..0000000 --- a/modules/base/meta.tf +++ /dev/null @@ -1,7 +0,0 @@ -data "kubernetes_service" "ingress_nginx_controller" { - metadata { - name = "ingress-nginx-controller" - namespace = "ingress-nginx" - } - depends_on = [helm_release.ingress_nginx] -} diff --git a/modules/base/outputs.tf b/modules/base/outputs.tf index 448eb4a..a24c0c8 100644 --- a/modules/base/outputs.tf +++ b/modules/base/outputs.tf @@ -26,5 +26,5 @@ output "aks_server_app_id" { output "ingress_nginx_external_ip" { description = "External IP address for the Nginx ingress controller" - value = local.ingress_address + value = azurerm_public_ip.ingress.ip_address } diff --git a/modules/base/providers.tf b/modules/base/providers.tf index c21c4a8..7c17168 100644 --- a/modules/base/providers.tf +++ b/modules/base/providers.tf @@ -20,10 +20,6 @@ terraform { source = "humanitec/humanitec" version = "~> 0" } - kubernetes = { - source = "hashicorp/kubernetes" - version = "~> 2.25" - } } required_version = ">= 1.3.0" }