Various fixes

StackEng · Sep 20, 2024 · 58ccf2a · 58ccf2a
1 parent c1ca1da
commit 58ccf2a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/cnab/app/generate-values.ps1 b/cnab/app/generate-values.ps1
@@ -79,7 +79,7 @@ function Generate-Values() {
 
     # Helm expects a YAML file but YAML is also a superset of JSON, so we can use ConvertTo-Json here
     $valuesFileContent = $values | ConvertTo-Json -Depth 100
-    Write-Output "Populated Helm values:"
-    Write-Output $valuesFileContent
+    Write-MinorStep "Populated Helm values:"
+    Write-MinorStep $valuesFileContent
     return $valuesFileContent
 }
diff --git a/cnab/app/run.ps1 b/cnab/app/run.ps1
@@ -79,8 +79,8 @@ Write-MajorStep "Running $action for Tenant: $tenant - Environment: $environment
 if ($vars.runtime.name -eq "GCP") {
   . $PSScriptRoot/gcp-cluster-discovery.ps1
   Write-MajorStep "Finding Deployment Group and Deployment Targetr"
-  $deploymentGroup = Find-DeploymentGroup "labels.env=dev AND labels.project=base AND labels.product=pubplat AND labels.instance=ascn-dev"
-  $deploymentTarget = Find-DeploymentTarget "deployment_target=true" $deploymentGroup
+  $deploymentGroup = Find-DeploymentGroup $vars.tenant_metadata.deploymentGroupFilter
+  $deploymentTarget = Find-DeploymentTarget $vars.tenant_metadata.deploymentTargetFilter $deploymentGroup
 
   if ($runAsContainer) {
     Write-MajorStep "Setting GCP cluster credentials"

diff --git a/cnab/app/variables.GCP.json b/cnab/app/variables.GCP.json
@@ -12,9 +12,8 @@
     "name": "GCP"
   },
   "tenant_metadata": {
-    "gke_cluster_name": "gke-sandbox-uc1-a",
-    "region": "us-central1",
-    "project": "gke-sandbox-2809"
+    "deploymentGroupFilter": "labels.env=dev AND labels.project=base AND labels.product=pubplat AND labels.instance=ascn-dev",
+    "deploymentTargetFilter": "deployment_target=true"
   },
   "vars": {
     "secretStore": "cluster-secrets",