Merge pull request #4757 from consideRatio/pr/fix-other

deployer: fix other templates referencing undefined var hub_name
2i2c-org · Sep 9, 2024 · 0754cb5 · 0754cb5
2 parents 08ff4a8 + 143c25e
commit 0754cb5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/terraform/aws/projects/projectpythia.tfvars b/terraform/aws/projects/projectpythia.tfvars
@@ -10,20 +10,20 @@ default_budget_alert = {
 #       to setup scratch buckets for the hubs on this cluster.
 #
 #user_buckets = {
-#  "scratch-" : {
-#    "delete_after" : 7
+#  "scratch-staging" : {
+#    "delete_after" : 7,
 #  },
-# Tip: add more scratch buckets below, if this cluster will be multi-tenant
+#  # Tip: add more scratch buckets below, if this cluster will be multi-tenant
 #}
 
 # Tip: uncomment and fill the missing info in the lines below if you want
 #       to setup specific cloud permissions for the buckets in this cluster.
 #
 #hub_cloud_permissions = {
-#  "" : {
+#  "staging" : {
 #    "user-sa" : {
-#      bucket_admin_access : ["scratch-"],
+#      bucket_admin_access : ["scratch-staging"],
 #    },
 #  },
-# # Tip: add more namespaces below, if this cluster will be multi-tenant
-#}
+#  # Tip: add more namespaces below, if this cluster will be multi-tenant
+#}
diff --git a/terraform/aws/projects/template.tfvars b/terraform/aws/projects/template.tfvars
@@ -11,20 +11,20 @@ cluster_nodes_location = "{{ cluster_region }}a"
 #       to setup scratch buckets for the hubs on this cluster.
 #
 #user_buckets = {
-#  "scratch-{{ hub_name }}" : {
-#    "delete_after" : 7
+#  "scratch-staging" : {
+#    "delete_after" : 7,
 #  },
-# Tip: add more scratch buckets below, if this cluster will be multi-tenant
+#  # Tip: add more scratch buckets below, if this cluster will be multi-tenant
 #}
 
 # Tip: uncomment and fill the missing info in the lines below if you want
 #       to setup specific cloud permissions for the buckets in this cluster.
 #
 #hub_cloud_permissions = {
-#  "{{ hub_name }}" : {
+#  "staging" : {
 #    "user-sa" : {
-#      bucket_admin_access : ["scratch-{{ hub_name }}"],
+#      bucket_admin_access : ["scratch-staging"],
 #    },
 #  },
-# # Tip: add more namespaces below, if this cluster will be multi-tenant
+#  # Tip: add more namespaces below, if this cluster will be multi-tenant
 #}
diff --git a/terraform/gcp/projects/cluster.tfvars.template b/terraform/gcp/projects/cluster.tfvars.template
@@ -42,20 +42,20 @@ enable_network_policy  = true
 #       to setup scratch buckets for the hubs on this cluster.
 #
 #user_buckets = {
-#  "scratch-{{ hub_name }}" : {
-#    "delete_after" : 7
+#  "scratch-staging" : {
+#    "delete_after" : 7,
 #  },
-  # Tip: add more scratch buckets below, if this cluster will be multi-tenant
+#  # Tip: add more scratch buckets below, if this cluster will be multi-tenant
 #}
 
 # Tip: uncomment and fill the missing info in the lines below if you want
 #       to setup specific cloud permissions for the buckets in this cluster.
 #
 #hub_cloud_permissions = {
-#  "{{ hub_name }}" : {
+#  "staging" : {
 #    allow_access_to_external_requester_pays_buckets : false,
-#    bucket_admin_access : ["scratch-{{ hub_name }}"],
-#    hub_namespace : "{{ hub_name }}"
+#    bucket_admin_access : ["scratch-staging"],
+#    hub_namespace : "staging",
 #  },
 #  # Tip: add more namespaces below, if this cluster will be multi-tenant
 #}