Merge branch 'GONRG-10579-move_from_deprecated_asm_module' into 'master'

Gonrg 10579 move from deprecated asm module

See merge request !1694

modules/osdu/asm.tf

 locals {
-  asm_channel = "regular"
   asm_enabled = (var.tier == "PROD") ? true : false
 }
 
-module "asm" {
-  count = local.asm_enabled ? 1 : 0
+resource "google_gke_hub_membership" "membership" {
+  count         = local.asm_enabled ? 1 : 0
+  membership_id = "${google_container_cluster.primary.name}-membership"
 
-  source  = "terraform-google-modules/kubernetes-engine/google//modules/asm"
-  version = "33.1.0"
-
-  project_id                = var.project_id
-  cluster_name              = google_container_cluster.primary.name
-  cluster_location          = google_container_cluster.primary.location
-  enable_cni                = true
-  enable_fleet_registration = true
-  enable_mesh_feature       = false
-  fleet_id                  = var.project_id
-  channel                   = local.asm_channel
-  module_depends_on = [
+  endpoint {
+    gke_cluster {
+      resource_link = "//container.googleapis.com/${google_container_cluster.primary.id}"
+    }
+  }
+  depends_on = [
     google_container_node_pool.regular_node_pool,
     google_container_node_pool.spot_node_pool,
   ]
 }
 
-module "gcloud" {
-  count = local.asm_enabled ? 1 : 0
+resource "google_gke_hub_feature" "servicemesh_feature" {
+  count    = local.asm_enabled ? 1 : 0
+  name     = "servicemesh"
+  location = "global"
+}
 
-  source  = "terraform-google-modules/gcloud/google"
-  version = "3.5.0"
+resource "google_gke_hub_feature_membership" "servicemesh_feature_membership" {
+  count      = local.asm_enabled ? 1 : 0
+  location   = "global"
+  feature    = google_gke_hub_feature.servicemesh_feature[count.index].name
+  membership = google_gke_hub_membership.membership[count.index].membership_id
 
-  create_cmd_entrypoint  = "gcloud"
-  create_cmd_body        = "container fleet mesh update --management automatic --memberships ${google_container_cluster.primary.name}-membership --project ${var.project_id}"
-  destroy_cmd_entrypoint = "gcloud"
-  destroy_cmd_body       = "container fleet mesh update --management manual --memberships ${google_container_cluster.primary.name}-membership --project ${var.project_id}"
-  module_depends_on      = [module.asm]
+  mesh {
+    management = "MANAGEMENT_AUTOMATIC"
+  }
+  depends_on = [
+    google_container_node_pool.regular_node_pool,
+    google_container_node_pool.spot_node_pool,
+  ]
 }
 
 resource "null_resource" "enable_fleet_mesh" {
@@ -42,4 +44,9 @@ resource "null_resource" "enable_fleet_mesh" {
   provisioner "local-exec" {
     command = "gcloud container fleet mesh enable --project ${var.project_id}"
   }
+
+  depends_on = [
+    google_gke_hub_feature.servicemesh_feature,
+    google_gke_hub_membership.membership,
+  ]
 }