[gold] Use nodeAffinity to restrict smaller pods to 16 core machines.
We target both n1 (currently used) and e2 (expected to be used).
Also reduce skia to 12 diffcalculators.
Bug: skia:10582
Change-Id: Ife70a7fad66d163a936c5aaf844bd5f55cc7bc63
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/371097
Reviewed-by: Kevin Lubick <kjlubick@google.com>
diff --git a/golden/k8s-config-templates/gold-baselineserver-template.yaml b/golden/k8s-config-templates/gold-baselineserver-template.yaml
index 7696f45..ec3a47d 100644
--- a/golden/k8s-config-templates/gold-baselineserver-template.yaml
+++ b/golden/k8s-config-templates/gold-baselineserver-template.yaml
@@ -36,6 +36,17 @@
prometheus.io.port: "20000"
spec:
affinity:
+ nodeAffinity: # Schedule these pods to a specific set of nodes.
+ requiredDuringSchedulingIgnoredDuringExecution:
+ nodeSelectorTerms:
+ # The following label/key will be available in 1.17
+ # "node.kubernetes.io/instance-type": "n1-standard-16"
+ - matchExpressions:
+ - key: "{{.K8S_NODE_SELECTOR_KEY}}"
+ operator: In
+ values: # Either of these two values are fine.
+ - "{{.K8S_NODE_SELECTOR_VALUE1}}"
+ - "{{.K8S_NODE_SELECTOR_VALUE2}}"
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector:
diff --git a/golden/k8s-config-templates/gold-common.json5 b/golden/k8s-config-templates/gold-common.json5
index 04b97bf..5452737 100644
--- a/golden/k8s-config-templates/gold-common.json5
+++ b/golden/k8s-config-templates/gold-common.json5
@@ -1,6 +1,6 @@
{
"BASELINE_SERVER_IMAGE": "gcr.io/skia-public/gold-baseline-server:2021-01-19T14_28_28Z-kjlubick-450bea3-clean",
- "DIFFCALCULATOR_IMAGE": "gcr.io/skia-public/gold-diffcalculator:2021-02-15T19_13_14Z-kjlubick-0b29bb9-clean",
+ "DIFFCALCULATOR_IMAGE": "gcr.io/skia-public/gold-diffcalculator:2021-02-17T15_23_01Z-kjlubick-496b7bd-clean",
"DIFF_SERVER_IMAGE": "gcr.io/skia-public/gold-diff-server:2021-01-19T14_27_42Z-kjlubick-450bea3-clean",
"INGESTION_BT_IMAGE": "gcr.io/skia-public/gold-ingestion:2021-02-15T14_17_39Z-kjlubick-b37d281-clean",
"SKIACORRECTNESS_IMAGE": "gcr.io/skia-public/gold-skiacorrectness:2021-02-17T12_48_31Z-kjlubick-496b7bd-clean",
diff --git a/golden/k8s-config-templates/gold-diffcalculator-template.yaml b/golden/k8s-config-templates/gold-diffcalculator-template.yaml
index 493e138..a36f59f 100644
--- a/golden/k8s-config-templates/gold-diffcalculator-template.yaml
+++ b/golden/k8s-config-templates/gold-diffcalculator-template.yaml
@@ -33,11 +33,18 @@
prometheus.io.scrape: "true"
prometheus.io.port: "20000"
spec:
- # Keep these pods restricted to an appropriate node.
- nodeSelector:
- "{{.K8S_NODE_SELECTOR_KEY}}": "{{.K8S_NODE_SELECTOR_VALUE}}"
- # The following will be available in 1.17
- # "node.kubernetes.io/instance-type": "n1-standard-16"
+ affinity:
+ nodeAffinity: # Schedule these pods to a specific set of nodes.
+ requiredDuringSchedulingIgnoredDuringExecution:
+ nodeSelectorTerms:
+ # The following label/key will be available in 1.17
+ # "node.kubernetes.io/instance-type": "n1-standard-16"
+ - matchExpressions:
+ - key: "{{.K8S_NODE_SELECTOR_KEY}}"
+ operator: In
+ values: # Either of these two values are fine.
+ - "{{.K8S_NODE_SELECTOR_VALUE1}}"
+ - "{{.K8S_NODE_SELECTOR_VALUE2}}"
automountServiceAccountToken: false
securityContext:
runAsUser: 2000 # aka skia
diff --git a/golden/k8s-config-templates/gold-ingestion-bt-template.yaml b/golden/k8s-config-templates/gold-ingestion-bt-template.yaml
index ebebbc7..bb0c0c7 100644
--- a/golden/k8s-config-templates/gold-ingestion-bt-template.yaml
+++ b/golden/k8s-config-templates/gold-ingestion-bt-template.yaml
@@ -33,6 +33,18 @@
prometheus.io.scrape: "true"
prometheus.io.port: "20000"
spec:
+ affinity:
+ nodeAffinity: # Schedule these pods to a specific set of nodes.
+ requiredDuringSchedulingIgnoredDuringExecution:
+ nodeSelectorTerms:
+ # The following label/key will be available in 1.17
+ # "node.kubernetes.io/instance-type": "n1-standard-16"
+ - matchExpressions:
+ - key: "{{.K8S_NODE_SELECTOR_KEY}}"
+ operator: In
+ values: # Either of these two values are fine.
+ - "{{.K8S_NODE_SELECTOR_VALUE1}}"
+ - "{{.K8S_NODE_SELECTOR_VALUE2}}"
automountServiceAccountToken: false
securityContext:
runAsUser: 2000 # aka skia
diff --git a/golden/k8s-instances/angle/angle-baselineserver.json5 b/golden/k8s-instances/angle/angle-baselineserver.json5
index c30e3d8..f0dc23e 100644
--- a/golden/k8s-instances/angle/angle-baselineserver.json5
+++ b/golden/k8s-instances/angle/angle-baselineserver.json5
@@ -1,4 +1,9 @@
{
port: ":8000",
prom_port: ":20000",
+
+ // These values affect the k8s deployment; they are not read in by the binary.
+ K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
diff --git a/golden/k8s-instances/angle/angle-diffcalculator.json5 b/golden/k8s-instances/angle/angle-diffcalculator.json5
index f214ee4..73c0d46 100644
--- a/golden/k8s-instances/angle/angle-diffcalculator.json5
+++ b/golden/k8s-instances/angle/angle-diffcalculator.json5
@@ -9,5 +9,6 @@
// These values affect the k8s deployment; they are not read in by the binary.
K8S_REPLICAS: 1,
K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
- K8S_NODE_SELECTOR_VALUE: "n1-standard-16"
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
\ No newline at end of file
diff --git a/golden/k8s-instances/angle/angle-ingestion-bt.json5 b/golden/k8s-instances/angle/angle-ingestion-bt.json5
index 3fb554d..2b6606f 100644
--- a/golden/k8s-instances/angle/angle-ingestion-bt.json5
+++ b/golden/k8s-instances/angle/angle-ingestion-bt.json5
@@ -41,5 +41,10 @@
ContinuousIntegrationSystems: "buildbucket",
}
}
- }
+ },
+
+ // These values affect the k8s deployment; they are not read in by the binary.
+ K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
diff --git a/golden/k8s-instances/chrome/chrome-baselineserver.json5 b/golden/k8s-instances/chrome/chrome-baselineserver.json5
index c30e3d8..f0dc23e 100644
--- a/golden/k8s-instances/chrome/chrome-baselineserver.json5
+++ b/golden/k8s-instances/chrome/chrome-baselineserver.json5
@@ -1,4 +1,9 @@
{
port: ":8000",
prom_port: ":20000",
+
+ // These values affect the k8s deployment; they are not read in by the binary.
+ K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
diff --git a/golden/k8s-instances/chrome/chrome-diffcalculator.json5 b/golden/k8s-instances/chrome/chrome-diffcalculator.json5
index 1f99837..c175ace 100644
--- a/golden/k8s-instances/chrome/chrome-diffcalculator.json5
+++ b/golden/k8s-instances/chrome/chrome-diffcalculator.json5
@@ -10,5 +10,6 @@
// These values affect the k8s deployment; they are not read in by the binary.
K8S_REPLICAS: 4,
K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
- K8S_NODE_SELECTOR_VALUE: "n1-standard-16"
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
\ No newline at end of file
diff --git a/golden/k8s-instances/chrome/chrome-ingestion-bt.json5 b/golden/k8s-instances/chrome/chrome-ingestion-bt.json5
index 498b4f3..d7feb3b 100644
--- a/golden/k8s-instances/chrome/chrome-ingestion-bt.json5
+++ b/golden/k8s-instances/chrome/chrome-ingestion-bt.json5
@@ -43,5 +43,10 @@
ContinuousIntegrationSystems: "buildbucket",
}
}
- }
+ },
+
+ // These values affect the k8s deployment; they are not read in by the binary.
+ K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
diff --git a/golden/k8s-instances/cros-tast-dev/cros-tast-dev-baselineserver.json5 b/golden/k8s-instances/cros-tast-dev/cros-tast-dev-baselineserver.json5
index c30e3d8..f0dc23e 100644
--- a/golden/k8s-instances/cros-tast-dev/cros-tast-dev-baselineserver.json5
+++ b/golden/k8s-instances/cros-tast-dev/cros-tast-dev-baselineserver.json5
@@ -1,4 +1,9 @@
{
port: ":8000",
prom_port: ":20000",
+
+ // These values affect the k8s deployment; they are not read in by the binary.
+ K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
diff --git a/golden/k8s-instances/cros-tast-dev/cros-tast-dev-diffcalculator.json5 b/golden/k8s-instances/cros-tast-dev/cros-tast-dev-diffcalculator.json5
index cb7e556..9e86d30 100644
--- a/golden/k8s-instances/cros-tast-dev/cros-tast-dev-diffcalculator.json5
+++ b/golden/k8s-instances/cros-tast-dev/cros-tast-dev-diffcalculator.json5
@@ -9,5 +9,6 @@
// These values affect the k8s deployment; they are not read in by the binary.
K8S_REPLICAS: 1,
K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
- K8S_NODE_SELECTOR_VALUE: "n1-standard-16"
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
\ No newline at end of file
diff --git a/golden/k8s-instances/cros-tast-dev/cros-tast-dev-ingestion-bt.json5 b/golden/k8s-instances/cros-tast-dev/cros-tast-dev-ingestion-bt.json5
index f32baf9..3b440b6 100644
--- a/golden/k8s-instances/cros-tast-dev/cros-tast-dev-ingestion-bt.json5
+++ b/golden/k8s-instances/cros-tast-dev/cros-tast-dev-ingestion-bt.json5
@@ -41,5 +41,10 @@
ContinuousIntegrationSystems: "buildbucket",
}
}
- }
+ },
+
+ // These values affect the k8s deployment; they are not read in by the binary.
+ K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
diff --git a/golden/k8s-instances/flutter-engine/flutter-engine-baselineserver.json5 b/golden/k8s-instances/flutter-engine/flutter-engine-baselineserver.json5
index c30e3d8..f0dc23e 100644
--- a/golden/k8s-instances/flutter-engine/flutter-engine-baselineserver.json5
+++ b/golden/k8s-instances/flutter-engine/flutter-engine-baselineserver.json5
@@ -1,4 +1,9 @@
{
port: ":8000",
prom_port: ":20000",
+
+ // These values affect the k8s deployment; they are not read in by the binary.
+ K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
diff --git a/golden/k8s-instances/flutter-engine/flutter-engine-diffcalculator.json5 b/golden/k8s-instances/flutter-engine/flutter-engine-diffcalculator.json5
index 46fdec8..b5e3cbe 100644
--- a/golden/k8s-instances/flutter-engine/flutter-engine-diffcalculator.json5
+++ b/golden/k8s-instances/flutter-engine/flutter-engine-diffcalculator.json5
@@ -9,5 +9,6 @@
// These values affect the k8s deployment; they are not read in by the binary.
K8S_REPLICAS: 1,
K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
- K8S_NODE_SELECTOR_VALUE: "n1-standard-16"
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
\ No newline at end of file
diff --git a/golden/k8s-instances/flutter-engine/flutter-engine-ingestion-bt.json5 b/golden/k8s-instances/flutter-engine/flutter-engine-ingestion-bt.json5
index 46dca10..3e079fb 100644
--- a/golden/k8s-instances/flutter-engine/flutter-engine-ingestion-bt.json5
+++ b/golden/k8s-instances/flutter-engine/flutter-engine-ingestion-bt.json5
@@ -42,5 +42,10 @@
ContinuousIntegrationSystems: "cirrus,buildbucket",
}
}
- }
+ },
+
+ // These values affect the k8s deployment; they are not read in by the binary.
+ K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
diff --git a/golden/k8s-instances/flutter/flutter-baselineserver.json5 b/golden/k8s-instances/flutter/flutter-baselineserver.json5
index c30e3d8..f0dc23e 100644
--- a/golden/k8s-instances/flutter/flutter-baselineserver.json5
+++ b/golden/k8s-instances/flutter/flutter-baselineserver.json5
@@ -1,4 +1,9 @@
{
port: ":8000",
prom_port: ":20000",
+
+ // These values affect the k8s deployment; they are not read in by the binary.
+ K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
diff --git a/golden/k8s-instances/flutter/flutter-diffcalculator.json5 b/golden/k8s-instances/flutter/flutter-diffcalculator.json5
index 85766fc..2385bf2 100644
--- a/golden/k8s-instances/flutter/flutter-diffcalculator.json5
+++ b/golden/k8s-instances/flutter/flutter-diffcalculator.json5
@@ -9,5 +9,6 @@
// These values affect the k8s deployment; they are not read in by the binary.
K8S_REPLICAS: 2,
K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
- K8S_NODE_SELECTOR_VALUE: "n1-standard-16"
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
\ No newline at end of file
diff --git a/golden/k8s-instances/flutter/flutter-ingestion-bt.json5 b/golden/k8s-instances/flutter/flutter-ingestion-bt.json5
index 284958a..e5014b8 100644
--- a/golden/k8s-instances/flutter/flutter-ingestion-bt.json5
+++ b/golden/k8s-instances/flutter/flutter-ingestion-bt.json5
@@ -42,5 +42,9 @@
ContinuousIntegrationSystems: "cirrus,buildbucket",
}
}
- }
+ },
+ // These values affect the k8s deployment; they are not read in by the binary.
+ K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
diff --git a/golden/k8s-instances/fuchsia-public/fuchsia-public-baselineserver.json5 b/golden/k8s-instances/fuchsia-public/fuchsia-public-baselineserver.json5
index c30e3d8..f0dc23e 100644
--- a/golden/k8s-instances/fuchsia-public/fuchsia-public-baselineserver.json5
+++ b/golden/k8s-instances/fuchsia-public/fuchsia-public-baselineserver.json5
@@ -1,4 +1,9 @@
{
port: ":8000",
prom_port: ":20000",
+
+ // These values affect the k8s deployment; they are not read in by the binary.
+ K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
diff --git a/golden/k8s-instances/fuchsia-public/fuchsia-public-diffcalculator.json5 b/golden/k8s-instances/fuchsia-public/fuchsia-public-diffcalculator.json5
index 5eb67a0..dfd6df5 100644
--- a/golden/k8s-instances/fuchsia-public/fuchsia-public-diffcalculator.json5
+++ b/golden/k8s-instances/fuchsia-public/fuchsia-public-diffcalculator.json5
@@ -9,5 +9,6 @@
// These values affect the k8s deployment; they are not read in by the binary.
K8S_REPLICAS: 1,
K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
- K8S_NODE_SELECTOR_VALUE: "n1-standard-16"
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
\ No newline at end of file
diff --git a/golden/k8s-instances/fuchsia-public/fuchsia-public-ingestion-bt.json5 b/golden/k8s-instances/fuchsia-public/fuchsia-public-ingestion-bt.json5
index 35b65c2..b410625 100644
--- a/golden/k8s-instances/fuchsia-public/fuchsia-public-ingestion-bt.json5
+++ b/golden/k8s-instances/fuchsia-public/fuchsia-public-ingestion-bt.json5
@@ -41,5 +41,9 @@
ContinuousIntegrationSystems: "buildbucket",
}
}
- }
+ },
+ // These values affect the k8s deployment; they are not read in by the binary.
+ K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
diff --git a/golden/k8s-instances/lottie/lottie-diffcalculator.json5 b/golden/k8s-instances/lottie/lottie-diffcalculator.json5
index b8c81cc..3ff4ea3 100644
--- a/golden/k8s-instances/lottie/lottie-diffcalculator.json5
+++ b/golden/k8s-instances/lottie/lottie-diffcalculator.json5
@@ -9,5 +9,6 @@
// These values affect the k8s deployment; they are not read in by the binary.
K8S_REPLICAS: 1,
K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
- K8S_NODE_SELECTOR_VALUE: "n1-standard-16"
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
\ No newline at end of file
diff --git a/golden/k8s-instances/lottie/lottie-ingestion-bt.json5 b/golden/k8s-instances/lottie/lottie-ingestion-bt.json5
index aefa349..9da47fe 100644
--- a/golden/k8s-instances/lottie/lottie-ingestion-bt.json5
+++ b/golden/k8s-instances/lottie/lottie-ingestion-bt.json5
@@ -21,5 +21,9 @@
BTTable: "gold-lottie"
}
},
- }
+ },
+ // These values affect the k8s deployment; they are not read in by the binary.
+ K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
diff --git a/golden/k8s-instances/pdfium/pdfium-diffcalculator.json5 b/golden/k8s-instances/pdfium/pdfium-diffcalculator.json5
index 7a45dba..d57f287 100644
--- a/golden/k8s-instances/pdfium/pdfium-diffcalculator.json5
+++ b/golden/k8s-instances/pdfium/pdfium-diffcalculator.json5
@@ -9,5 +9,6 @@
// These values affect the k8s deployment; they are not read in by the binary.
K8S_REPLICAS: 1,
K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
- K8S_NODE_SELECTOR_VALUE: "n1-standard-16"
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
\ No newline at end of file
diff --git a/golden/k8s-instances/pdfium/pdfium-ingestion-bt.json5 b/golden/k8s-instances/pdfium/pdfium-ingestion-bt.json5
index 13cfa71..857a816 100644
--- a/golden/k8s-instances/pdfium/pdfium-ingestion-bt.json5
+++ b/golden/k8s-instances/pdfium/pdfium-ingestion-bt.json5
@@ -41,5 +41,9 @@
ContinuousIntegrationSystems: "buildbucket",
}
}
- }
+ },
+ // These values affect the k8s deployment; they are not read in by the binary.
+ K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
diff --git a/golden/k8s-instances/skia-infra/skia-infra-baselineserver.json5 b/golden/k8s-instances/skia-infra/skia-infra-baselineserver.json5
index c30e3d8..f0dc23e 100644
--- a/golden/k8s-instances/skia-infra/skia-infra-baselineserver.json5
+++ b/golden/k8s-instances/skia-infra/skia-infra-baselineserver.json5
@@ -1,4 +1,9 @@
{
port: ":8000",
prom_port: ":20000",
+
+ // These values affect the k8s deployment; they are not read in by the binary.
+ K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
diff --git a/golden/k8s-instances/skia-infra/skia-infra-diffcalculator.json5 b/golden/k8s-instances/skia-infra/skia-infra-diffcalculator.json5
index c7fe158..f7c0e77 100644
--- a/golden/k8s-instances/skia-infra/skia-infra-diffcalculator.json5
+++ b/golden/k8s-instances/skia-infra/skia-infra-diffcalculator.json5
@@ -9,5 +9,6 @@
// These values affect the k8s deployment; they are not read in by the binary.
K8S_REPLICAS: 1,
K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
- K8S_NODE_SELECTOR_VALUE: "n1-standard-16"
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16",
}
\ No newline at end of file
diff --git a/golden/k8s-instances/skia-infra/skia-infra-ingestion-bt.json5 b/golden/k8s-instances/skia-infra/skia-infra-ingestion-bt.json5
index cbdd2c9..bc10381 100644
--- a/golden/k8s-instances/skia-infra/skia-infra-ingestion-bt.json5
+++ b/golden/k8s-instances/skia-infra/skia-infra-ingestion-bt.json5
@@ -41,5 +41,9 @@
ContinuousIntegrationSystems: "buildbucket",
}
}
- }
+ },
+ // These values affect the k8s deployment; they are not read in by the binary.
+ K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
diff --git a/golden/k8s-instances/skia/skia-diffcalculator.json5 b/golden/k8s-instances/skia/skia-diffcalculator.json5
index 552109a..d813cc6 100644
--- a/golden/k8s-instances/skia/skia-diffcalculator.json5
+++ b/golden/k8s-instances/skia/skia-diffcalculator.json5
@@ -7,7 +7,8 @@
tiles_to_process: 2,
// These values affect the k8s deployment; they are not read in by the binary.
- K8S_REPLICAS: 16,
+ K8S_REPLICAS: 12,
K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
- K8S_NODE_SELECTOR_VALUE: "n1-standard-16"
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
\ No newline at end of file
diff --git a/golden/k8s-instances/skia/skia-ingestion-bt.json5 b/golden/k8s-instances/skia/skia-ingestion-bt.json5
index e51c26b..7ca7085 100644
--- a/golden/k8s-instances/skia/skia-ingestion-bt.json5
+++ b/golden/k8s-instances/skia/skia-ingestion-bt.json5
@@ -41,5 +41,9 @@
ContinuousIntegrationSystems: "buildbucket",
}
}
- }
+ },
+ // These values affect the k8s deployment; they are not read in by the binary.
+ K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
diff --git a/golden/k8s-instances/skia/skia-ingestion-sql.json5 b/golden/k8s-instances/skia/skia-ingestion-sql.json5
index feda59f..2ce893d 100644
--- a/golden/k8s-instances/skia/skia-ingestion-sql.json5
+++ b/golden/k8s-instances/skia/skia-ingestion-sql.json5
@@ -19,5 +19,9 @@
SQLConnectionURL: "postgresql://root@gold-cockroachdb-public:26234/staging_db?sslmode=disable",
}
}
- }
+ },
+ // These values affect the k8s deployment; they are not read in by the binary.
+ K8S_NODE_SELECTOR_KEY: "beta.kubernetes.io/instance-type",
+ K8S_NODE_SELECTOR_VALUE1: "n1-standard-16",
+ K8S_NODE_SELECTOR_VALUE2: "e2-standard-16"
}
