Update placement of vpc-connector details for Cloud Run Work Pool (#223)

* Google changed where the vpc-connector details are included in the API * undo bad format
PrefectHQ · Feb 23, 2024 · ea32a84 · ea32a84
1 parent 72bc6ea
commit ea32a84
Showing 1 changed file with 26 additions and 12 deletions.
diff --git a/prefect_gcp/workers/cloud_run.py b/prefect_gcp/workers/cloud_run.py
@@ -31,7 +31,6 @@
                 "annotations":
                 {
                     "run.googleapis.com/launch-stage": "BETA",
-                    "run.googleapis.com/vpc-access-connector": "{{ vpc_connector_name }}"
                 }
             },
             "spec":
@@ -70,7 +69,15 @@
                         }
                     }
                     }
+                },
+                "metadata":
+                {
+                    "annotations":
+                    {
+                        "run.googleapis.com/vpc-access-connector": "{{ vpc_connector_name }}"
+                    }
                 }
+            },
         },
         "timeout": "{{ timeout }}",
         "keep_job": "{{ keep_job }}"
@@ -101,7 +108,6 @@
             {
                 "run.googleapis.com/my-custom-annotation": "{{ my_custom_annotation }}",
                 "run.googleapis.com/launch-stage": "BETA",
-                "run.googleapis.com/vpc-access-connector": "{{ vpc_connector_name }}"
             },
           ...
         },
@@ -126,17 +132,21 @@
     {
         "apiVersion": "run.googleapis.com/v1",
         "kind": "Job",
-        "metadata":
+        "spec":
         {
-            "name": "{{ name }}",
-            "annotations":
+            "template":
             {
-                "run.googleapis.com/launch-stage": "BETA",
-                "run.googleapis.com/vpc-access-connector": "my-vpc-connector"
-            }
-          ...
-        },
-      ...
+                "metadata":
+                {
+                    "annotations":
+                    {
+                        "run.googleapis.com/vpc-access-connector": "my-vpc-connector"
+                    }
+                },
+                ...
+            },
+            ...
+        }
     }
     ```
 """
@@ -191,7 +201,6 @@ def _get_default_job_body_template() -> Dict[str, Any]:
             "annotations": {
                 # See: https://cloud.google.com/run/docs/troubleshooting#launch-stage-validation  # noqa
                 "run.googleapis.com/launch-stage": "BETA",
-                "run.googleapis.com/vpc-access-connector": "{{ vpc_connector_name }}",
             },
         },
         "spec": {  # JobSpec
@@ -220,6 +229,11 @@ def _get_default_job_body_template() -> Dict[str, Any]:
                         }
                     },
                 },
+                "metadata": {
+                    "annotations": {
+                        "run.googleapis.com/vpc-access-connector": "{{ vpc_connector_name }}"  # noqa
+                    }
+                },
             },
         },
     }