Merge pull request #9 from mkulke/mkulke/add-vm-location-param

garm: introduce vm_location param
confidential-containers · Feb 1, 2024 · 3764ed8 · 3764ed8
2 parents 3ac177c + beaabde
commit 3764ed8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/github/azure-self-hosted-runners/templates/azure-config.toml b/github/azure-self-hosted-runners/templates/azure-config.toml
@@ -1,4 +1,4 @@
-location = "{{ env['LOCATION'] }}"
+location = "{{ env['VM_LOCATION'] }}"
 
 [credentials]
 subscription_id = "{{ env['SUBSCRIPTION_ID'] }}"

diff --git a/github/azure-self-hosted-runners/tf/main.tf b/github/azure-self-hosted-runners/tf/main.tf
@@ -87,7 +87,7 @@ resource "azurerm_container_group" "garm_aci" {
       GARM_HOSTNAME   = local.fqdn
       SUBSCRIPTION_ID = data.azurerm_subscription.current.subscription_id
       AZURE_CLIENT_ID = azurerm_user_assigned_identity.garm_id.client_id
-	  LOCATION        = var.location
+      VM_LOCATION     = var.vm_location
     }
 
     secure_environment_variables = {

diff --git a/github/azure-self-hosted-runners/tf/variables.tf b/github/azure-self-hosted-runners/tf/variables.tf
@@ -10,6 +10,12 @@ variable "location" {
   description = "Location for all resources"
 }
 
+variable "vm_location" {
+  type        = string
+  default     = "westeurope"
+  description = "Location for the runner VMs"
+}
+
 variable "garm_image" {
   type        = string
   default     = "ghcr.io/confidential-containers/garm:main"