kovagoadi/hunfabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fast/gke2

Browse Source
This commit is contained in:
Ludovico Magnocavallo
2022-07-30 13:53:48 +00:00
committed by GitHub
parent e4de73febb 3778d37d18
commit 45517045a2
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gke-hub/README.md
View File

@@ -117,7 +117,7 @@ module "hub" {
}
}
# tftest modules=4 resources=16
# tftest modules=4 resources=15
```
## Multi-cluster mesh on GKE
@@ -323,7 +323,7 @@ module "hub" {
"cluster-2"
]
}
# tftest modules=8 resources=29
# tftest modules=8 resources=28
```
<!-- BEGIN TFDOC -->

5
modules/gke-hub/main.tf
View File

@@ -29,6 +29,9 @@ locals {
var.features.configmanagement == true
)
}
hub_features = {
for k, v in var.features : k => v if v != null && v != false && v != ""
}
}
resource "google_gke_hub_membership" "default" {
@@ -53,7 +56,7 @@ resource "google_gke_hub_membership" "default" {
resource "google_gke_hub_feature" "default" {
provider = google-beta
for_each = { for k, v in var.features : k => v if coalesce(v, false) != false }
for_each = local.hub_features
project = var.project_id
name = each.key
location = "global"

3
tests/modules/gke_hub/test_plan.py
View File

@@ -23,10 +23,9 @@ def resources(plan_runner):
def test_resource_count(resources):
"Test number of resources created."
assert len(resources) == 6
assert len(resources) == 5
assert sorted(r['address'] for r in resources) == [
'module.hub.google_gke_hub_feature.default["configmanagement"]',
'module.hub.google_gke_hub_feature.default["multiclusteringress"]',
'module.hub.google_gke_hub_feature_membership.default["cluster-1"]',
'module.hub.google_gke_hub_feature_membership.default["cluster-2"]',
'module.hub.google_gke_hub_membership.default["cluster-1"]',