OCPBUGS-33709: GCP mixup when using the ignition shim vs the signed url

barbacbd · barbacbd · commit 133c5a0e0912 · 2024-05-15T08:40:10.000-04:00
** Ignition was being given the signed url, but the url does not point to ignition data
that contains the proxy information. The ignition shim contains the url and should be supplied
as metadata to the bootstrap node. The shim will contain the url as well as proxy data, and the url
will point to the bucket that contains the actual ignition bootstrap data.
diff --git a/data/data/gcp/bootstrap/main.tf b/data/data/gcp/bootstrap/main.tf
@@ -118,7 +118,7 @@ resource "google_compute_instance" "bootstrap" {
   }
 
   metadata = {
-    user-data = data.ignition_config.redirect.rendered
+    user-data = var.gcp_ignition_shim
   }
 
   tags = ["${var.cluster_id}-master", "${var.cluster_id}-bootstrap"]

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ resource "google_compute_instance" "bootstrap" {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`metadata = {`
`121`		`- user-data = data.ignition_config.redirect.rendered`
	`121`	`+ user-data = var.gcp_ignition_shim`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`tags = ["${var.cluster_id}-master", "${var.cluster_id}-bootstrap"]`