[DXP-2040] Fix failing Terraform deployments caused by Helm provider v3.0.0

terraform/azure/platform/main.tf

@@ -26,19 +26,6 @@ module "azure_platform" {
   public_ip_id         = var.public_ip_id
 }
 
-module "apisix" {
-  source = "./modules/apisix"
-
-  values = [
-    file("${path.module}/config/gateway/values.yaml")
-  ]
-
-  settings = var.public_ip_address != null && var.public_ip_address != "" ? {
-    "gateway.annotations.service\\.beta\\.kubernetes\\.io/azure-load-balancer-resource-group" : var.resource_group_name
-    "gateway.loadBalancerIP" : var.public_ip_address
-  } : {}
-}
-
 module "monitoring_tempo" {
   source                            = "./modules/monitoring-tempo"
   monitoring_storage_container_name = var.monitoring_storage_container_name
@@ -68,7 +55,7 @@ module "grafana_secret" {
 
 module "streamx" {
   source  = "streamx-dev/charts/helm"
-  version = "0.0.6"
+  version = "0.0.13"
 
   ingress_controller_nginx_enabled                         = false
   cert_manager_lets_encrypt_issuer_acme_email              = var.cert_manager_lets_encrypt_issuer_acme_email
@@ -82,6 +69,14 @@ module "streamx" {
   streamx_operator_chart_repository_username           = "_json_key_base64"
   streamx_operator_chart_repository_password           = var.streamx_operator_image_pull_secret_registry_password
 
+  ingress_controller_apisix_settings = var.public_ip_address != null && var.public_ip_address != "" ? {
+    "gateway.annotations.service\\.beta\\.kubernetes\\.io/azure-load-balancer-resource-group" : var.resource_group_name
+    "gateway.loadBalancerIP" : var.public_ip_address
+  } : {}
+  ingress_controller_apisix_values = [
+    file("${path.module}/config/gateway/values.yaml")
+  ]
+
   tempo_create_namespace = false
   tempo_values = [
     file("${path.module}/config/monitoring/tempo/values.yaml")

terraform/azure/platform/outputs.tf

@@ -17,5 +17,5 @@ output "kubeconfig" {
 
 output "loadbalancer_ip" {
   description = "K8s cluster Load Balancer IP"
-  value       = module.apisix.ingress_ip
+  value       = module.streamx.loadbalancer_ip
 }

terraform/azure/platform/versions.tf

@@ -9,5 +9,9 @@ terraform {
       source  = "gavinbunney/kubectl"
       version = "~> 1.19.0"
     }
+    helm = {
+      source  = "hashicorp/helm"
+      version = ">= 2.17.0, < 3.0.0"
+    }
   }
 }