feat: added multiclusteringress hub feature for use by multiclustergateway (#24)

Co-authored-by: Andrew Peabody <[email protected]>

Author: yliaog

2-multitenant/modules/env_baseline/main.tf

@@ -60,7 +60,9 @@ module "eab_fleet_project" {
   activate_apis = [
     "gkehub.googleapis.com",
     "anthos.googleapis.com",
-    "compute.googleapis.com"
+    "compute.googleapis.com",
+    "multiclusteringress.googleapis.com",
+    "multiclusterservicediscovery.googleapis.com"
   ]
 }
 

4-fleetscope/envs/development/main.tf

@@ -25,7 +25,7 @@ module "env" {
   source = "../../modules/env_baseline"
 
   env                    = local.env
-  project_id             = var.fleet_project_id
+  fleet_project_id       = var.fleet_project_id
   scope_id               = local.scope_id
   cluster_membership_ids = var.cluster_membership_ids
   namespace_id           = local.namespace_id

4-fleetscope/envs/non-production/main.tf

@@ -25,7 +25,7 @@ module "env" {
   source = "../../modules/env_baseline"
 
   env                    = local.env
-  project_id             = var.fleet_project_id
+  fleet_project_id       = var.fleet_project_id
   scope_id               = local.scope_id
   cluster_membership_ids = var.cluster_membership_ids
   namespace_id           = local.namespace_id

4-fleetscope/envs/production/main.tf

@@ -25,7 +25,7 @@ module "env" {
   source = "../../modules/env_baseline"
 
   env                    = local.env
-  project_id             = var.fleet_project_id
+  fleet_project_id       = var.fleet_project_id
   scope_id               = local.scope_id
   cluster_membership_ids = var.cluster_membership_ids
   namespace_id           = local.namespace_id

4-fleetscope/modules/env_baseline/README.md

@@ -13,8 +13,8 @@ The following resources are created:
 |------|-------------|------|---------|:--------:|
 | cluster\_membership\_ids | The membership IDs in the scope | `list(string)` | n/a | yes |
 | env | The environment to prepare (ex. development) | `string` | n/a | yes |
+| fleet\_project\_id | The fleet project ID | `string` | n/a | yes |
 | namespace\_id | The fleet namespace ID | `string` | n/a | yes |
-| project\_id | The fleet project ID | `string` | n/a | yes |
 | scope\_id | The fleet scope ID | `string` | n/a | yes |
 
 ## Outputs

4-fleetscope/modules/env_baseline/main.tf

@@ -26,14 +26,14 @@ resource "random_string" "suffix" {
 
 resource "google_gke_hub_scope" "fleet-scope" {
   scope_id = "${var.scope_id}-${var.env}"
-  project  = var.project_id
+  project  = var.fleet_project_id
 }
 
 resource "google_gke_hub_namespace" "fleet-ns" {
   scope_namespace_id = "${var.namespace_id}-${var.env}"
   scope_id           = google_gke_hub_scope.fleet-scope.scope_id
   scope              = google_gke_hub_scope.fleet-scope.name
-  project            = var.project_id
+  project            = var.fleet_project_id
 }
 
 resource "google_gke_hub_membership_binding" "membership-binding" {
@@ -43,5 +43,5 @@ resource "google_gke_hub_membership_binding" "membership-binding" {
   scope                 = google_gke_hub_scope.fleet-scope.name
   membership_id         = regex(local.membership_re, each.key)[2]
   location              = regex(local.membership_re, each.key)[1]
-  project               = var.project_id
+  project               = var.fleet_project_id
 }

4-fleetscope/modules/env_baseline/mcg.tf

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+locals {
+  fleet_membership_re = "//gkehub.googleapis.com/(.*)$"
+}
+
+resource "google_gke_hub_feature" "mci" {
+  name     = "multiclusteringress"
+  location = "global"
+  project  = var.fleet_project_id
+  spec {
+    multiclusteringress {
+      config_membership = regex(local.fleet_membership_re, var.cluster_membership_ids[0])[0]
+    }
+  }
+}
+
+resource "google_gke_hub_feature" "mcs" {
+  name     = "multiclusterservicediscovery"
+  location = "global"
+  project  = var.fleet_project_id
+}

4-fleetscope/modules/env_baseline/variables.tf

@@ -19,7 +19,7 @@ variable "env" {
   type        = string
 }
 
-variable "project_id" {
+variable "fleet_project_id" {
   description = "The fleet project ID"
   type        = string
 }