Merge pull request #24 from gitpod-io/nv/fix-authoritative-metadata

fix: replace authoritative project metadata with non-authoritative items (B1)

Author: nandajavarma

runner-vm.tf

@@ -356,11 +356,17 @@ resource "google_compute_health_check" "runner" {
 
 
 # Resource tagging for lifecycle management
-resource "google_compute_project_metadata" "runner_metadata" {
+# Use google_compute_project_metadata_item (non-authoritative) instead of
+# google_compute_project_metadata to avoid clobbering other project metadata
+# (OS Login config, SSH keys, etc.) managed outside this module.
+resource "google_compute_project_metadata_item" "enable_oslogin" {
   project = var.project_id
+  key     = "enable-oslogin"
+  value   = "TRUE"
+}
 
-  metadata = {
-    "enable-oslogin"   = "TRUE"
-    "gitpod-runner-id" = var.runner_id
-  }
+resource "google_compute_project_metadata_item" "runner_id" {
+  project = var.project_id
+  key     = "gitpod-runner-id"
+  value   = var.runner_id
 }