More spot fixes (#2157)

* Fix github PR query * More k8s config spot fixes
opensource-observer · Sep 16, 2024 · b995cbe · b995cbe
1 parent fbdce22
commit b995cbe
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/warehouse/dbt/models/staging/github/stg_github__pull_requests.sql b/warehouse/dbt/models/staging/github/stg_github__pull_requests.sql
@@ -17,5 +17,5 @@ select
   pre.actor.login as actor_login,
   CONCAT("PULL_REQUEST_", UPPER(JSON_VALUE(pre.payload, "$.action")))
     as `type`,
-  JSON_VALUE(ie.payload, "$.number") as `number`
+  JSON_VALUE(pre.payload, "$.number") as `number`
 from pull_request_events as pre
diff --git a/warehouse/oso_dagster/assets/clickhouse_dbt_marts.py b/warehouse/oso_dagster/assets/clickhouse_dbt_marts.py
@@ -88,6 +88,7 @@ def clickhouse_assets_from_manifests_map(
                         asset_kwargs={
                             "op_tags": {
                                 "dagster-k8s/config": {
+                                    "merge_behavior": "SHALLOW",
                                     "resources": {
                                         "requests": {
                                             "cpu": "1000m",
@@ -98,19 +99,19 @@ def clickhouse_assets_from_manifests_map(
                                             "memory": "1024Mi",
                                         },
                                     },
-                                },
-                                "pod_spec_config": {
-                                    "node_selector": {
-                                        "pool_type": "spot",
+                                    "pod_spec_config": {
+                                        "node_selector": {
+                                            "pool_type": "spot",
+                                        },
+                                        "tolerations": [
+                                            {
+                                                "key": "pool_type",
+                                                "operator": "Equal",
+                                                "value": "spot",
+                                                "effect": "NoSchedule",
+                                            }
+                                        ],
                                     },
-                                    "tolerations": [
-                                        {
-                                            "key": "pool_type",
-                                            "operator": "Equal",
-                                            "value": "spot",
-                                            "effect": "NoSchedule",
-                                        }
-                                    ],
                                 },
                             }
                         },

diff --git a/warehouse/oso_dagster/assets/open_collective.py b/warehouse/oso_dagster/assets/open_collective.py
@@ -296,6 +296,7 @@ def expenses(
     ),
     op_tags={
         "dagster-k8s/config": {
+                                    "merge_behavior": "SHALLOW",
             "container_config": {
                 "resources": {
                     "requests": {"cpu": "2000m", "memory": "3584Mi"},

diff --git a/warehouse/oso_dagster/factories/goldsky/additional.py b/warehouse/oso_dagster/factories/goldsky/additional.py
@@ -24,6 +24,7 @@ def generated_asset_prefix(asset: AssetsDefinition):
 
 base_tags = {
     "dagster-k8s/config": {
+        "merge_behavior": "SHALLOW",
         "pod_spec_config": {
             "node_selector": {"pool_type": "standard"},
             "tolerations": [
@@ -35,7 +36,6 @@ def generated_asset_prefix(asset: AssetsDefinition):
                 }
             ],
         },
-        "merge_behavior": "SHALLOW",
     },
 }
 

diff --git a/warehouse/oso_dagster/factories/goldsky/assets.py b/warehouse/oso_dagster/factories/goldsky/assets.py
@@ -966,6 +966,7 @@ def materialize_asset(
 
     op_tags: Dict[str, Any] = {
         "dagster-k8s/config": {
+            "merge_behavior": "SHALLOW",
             "container_config": {
                 "resources": {
                     "requests": {"cpu": "2000m", "memory": "3584Mi"},