ref(k8s): Remove taint (#440)

iambriccardo · web-flow · commit 5237f5f7f30b · 2025-11-07T11:43:01.000+01:00
diff --git a/etl-api/src/k8s/http.rs b/etl-api/src/k8s/http.rs
@@ -667,7 +667,6 @@ fn create_node_selector_json(environment: &Environment) -> serde_json::Value {
     match environment {
         Environment::Dev => json!({}),
         Environment::Staging | Environment::Prod => json!({
-            "nodeType": "workloads",
             "etl.supabase.com/node-role": "workloads"
         }),
     }
@@ -886,12 +885,6 @@ fn create_replicator_stateful_set_json(
             "volumes": volumes,
             // Allow scheduling onto nodes tainted with the right node role.
             "tolerations": [
-              {
-                "key": "nodeType",
-                "operator": "Equal",
-                "value": "workloads",
-                "effect": "NoSchedule"
-              },
               {
                 "key": "etl.supabase.com/node-role",
                 "operator": "Equal",
diff --git a/etl-api/src/k8s/snapshots/etl_api__k8s__http__tests__create_bq_replicator_stateful_set_json-2.snap b/etl-api/src/k8s/snapshots/etl_api__k8s__http__tests__create_bq_replicator_stateful_set_json-2.snap
@@ -151,17 +151,10 @@ expression: stateful_set_json
           }
         ],
         "nodeSelector": {
-          "etl.supabase.com/node-role": "workloads",
-          "nodeType": "workloads"
+          "etl.supabase.com/node-role": "workloads"
         },
         "terminationGracePeriodSeconds": 300,
         "tolerations": [
-          {
-            "effect": "NoSchedule",
-            "key": "nodeType",
-            "operator": "Equal",
-            "value": "workloads"
-          },
           {
             "effect": "NoSchedule",
             "key": "etl.supabase.com/node-role",
diff --git a/etl-api/src/k8s/snapshots/etl_api__k8s__http__tests__create_bq_replicator_stateful_set_json-3.snap b/etl-api/src/k8s/snapshots/etl_api__k8s__http__tests__create_bq_replicator_stateful_set_json-3.snap
@@ -151,17 +151,10 @@ expression: stateful_set_json
           }
         ],
         "nodeSelector": {
-          "etl.supabase.com/node-role": "workloads",
-          "nodeType": "workloads"
+          "etl.supabase.com/node-role": "workloads"
         },
         "terminationGracePeriodSeconds": 300,
         "tolerations": [
-          {
-            "effect": "NoSchedule",
-            "key": "nodeType",
-            "operator": "Equal",
-            "value": "workloads"
-          },
           {
             "effect": "NoSchedule",
             "key": "etl.supabase.com/node-role",
diff --git a/etl-api/src/k8s/snapshots/etl_api__k8s__http__tests__create_bq_replicator_stateful_set_json.snap b/etl-api/src/k8s/snapshots/etl_api__k8s__http__tests__create_bq_replicator_stateful_set_json.snap
@@ -82,12 +82,6 @@ expression: stateful_set_json
         "nodeSelector": {},
         "terminationGracePeriodSeconds": 300,
         "tolerations": [
-          {
-            "effect": "NoSchedule",
-            "key": "nodeType",
-            "operator": "Equal",
-            "value": "workloads"
-          },
           {
             "effect": "NoSchedule",
             "key": "etl.supabase.com/node-role",
diff --git a/etl-api/src/k8s/snapshots/etl_api__k8s__http__tests__create_iceberg_replicator_stateful_set_json-2.snap b/etl-api/src/k8s/snapshots/etl_api__k8s__http__tests__create_iceberg_replicator_stateful_set_json-2.snap
@@ -169,17 +169,10 @@ expression: stateful_set_json
           }
         ],
         "nodeSelector": {
-          "etl.supabase.com/node-role": "workloads",
-          "nodeType": "workloads"
+          "etl.supabase.com/node-role": "workloads"
         },
         "terminationGracePeriodSeconds": 300,
         "tolerations": [
-          {
-            "effect": "NoSchedule",
-            "key": "nodeType",
-            "operator": "Equal",
-            "value": "workloads"
-          },
           {
             "effect": "NoSchedule",
             "key": "etl.supabase.com/node-role",
diff --git a/etl-api/src/k8s/snapshots/etl_api__k8s__http__tests__create_iceberg_replicator_stateful_set_json-3.snap b/etl-api/src/k8s/snapshots/etl_api__k8s__http__tests__create_iceberg_replicator_stateful_set_json-3.snap
@@ -169,17 +169,10 @@ expression: stateful_set_json
           }
         ],
         "nodeSelector": {
-          "etl.supabase.com/node-role": "workloads",
-          "nodeType": "workloads"
+          "etl.supabase.com/node-role": "workloads"
         },
         "terminationGracePeriodSeconds": 300,
         "tolerations": [
-          {
-            "effect": "NoSchedule",
-            "key": "nodeType",
-            "operator": "Equal",
-            "value": "workloads"
-          },
           {
             "effect": "NoSchedule",
             "key": "etl.supabase.com/node-role",
diff --git a/etl-api/src/k8s/snapshots/etl_api__k8s__http__tests__create_iceberg_replicator_stateful_set_json.snap b/etl-api/src/k8s/snapshots/etl_api__k8s__http__tests__create_iceberg_replicator_stateful_set_json.snap
@@ -100,12 +100,6 @@ expression: stateful_set_json
         "nodeSelector": {},
         "terminationGracePeriodSeconds": 300,
         "tolerations": [
-          {
-            "effect": "NoSchedule",
-            "key": "nodeType",
-            "operator": "Equal",
-            "value": "workloads"
-          },
           {
             "effect": "NoSchedule",
             "key": "etl.supabase.com/node-role",
diff --git a/etl-api/src/k8s/snapshots/etl_api__k8s__http__tests__create_node_selector-2.snap b/etl-api/src/k8s/snapshots/etl_api__k8s__http__tests__create_node_selector-2.snap
@@ -3,6 +3,5 @@ source: etl-api/src/k8s/http.rs
 expression: node_selector
 ---
 {
-  "etl.supabase.com/node-role": "workloads",
-  "nodeType": "workloads"
+  "etl.supabase.com/node-role": "workloads"
 }
diff --git a/etl-api/src/k8s/snapshots/etl_api__k8s__http__tests__create_node_selector-3.snap b/etl-api/src/k8s/snapshots/etl_api__k8s__http__tests__create_node_selector-3.snap
@@ -3,6 +3,5 @@ source: etl-api/src/k8s/http.rs
 expression: node_selector
 ---
 {
-  "etl.supabase.com/node-role": "workloads",
-  "nodeType": "workloads"
+  "etl.supabase.com/node-role": "workloads"
 }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,5 @@ source: etl-api/src/k8s/http.rs`
`3`	`3`	`expression: node_selector`
`4`	`4`	`---`
`5`	`5`	`{`
`6`		`- "etl.supabase.com/node-role": "workloads",`
`7`		`- "nodeType": "workloads"`
	`6`	`+ "etl.supabase.com/node-role": "workloads"`
`8`	`7`	`}`