From 5a9543259b1b8791a0bb311eadee8bb71cca3efc Mon Sep 17 00:00:00 2001 From: gmega Date: Mon, 24 Feb 2025 14:16:59 -0300 Subject: [PATCH] feat: add support for region k8s annotations --- k8s/argo-workflows/benchmark-workflow.yaml | 7 +++++-- k8s/charts/codex/templates/_helpers.tpl | 3 +++ k8s/charts/codex/values.yaml | 3 +++ k8s/charts/deluge/templates/_helpers.tpl | 3 +++ k8s/charts/deluge/values.yaml | 3 +++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/k8s/argo-workflows/benchmark-workflow.yaml b/k8s/argo-workflows/benchmark-workflow.yaml index c47139e..1dc96f2 100644 --- a/k8s/argo-workflows/benchmark-workflow.yaml +++ b/k8s/argo-workflows/benchmark-workflow.yaml @@ -48,7 +48,9 @@ spec: # to largest. This can save significant amounts of time when running on a cluster with autoscaling. - name: orderBy value: '["networkSize", "seeders", "fileSize"]' - + # The region in which to deploy machines. Leave empty to deploy to default. + - name: region + value: "" templates: - name: benchmark-workflow @@ -336,7 +338,8 @@ spec: --set experiment.seeders={{inputs.parameters.seeders}}\ --set experiment.seederSets={{inputs.parameters.seederSets}}\ --set deployment.minikubeEnv={{workflow.parameters.minikubeEnv}}\ - --set deployment.nodeTag={{workflow.parameters.nodeTag}} + --set deployment.nodeTag={{workflow.parameters.nodeTag}}\ + --set deployment.region={{workflow.parameters.region}} - name: wait-for-experiment inputs: diff --git a/k8s/charts/codex/templates/_helpers.tpl b/k8s/charts/codex/templates/_helpers.tpl index 1624207..b1f6446 100644 --- a/k8s/charts/codex/templates/_helpers.tpl +++ b/k8s/charts/codex/templates/_helpers.tpl @@ -51,6 +51,9 @@ app.kubernetes.io/name: {{ include "app.name" . }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- if .Values.deployment.region }} +topology.kubernetes.io/region: {{ .Values.deployment.region }} +{{- end }} {{- end }} {{- define "codex-benchmarks.selectorLabels" -}} diff --git a/k8s/charts/codex/values.yaml b/k8s/charts/codex/values.yaml index ea56455..19f4a2d 100644 --- a/k8s/charts/codex/values.yaml +++ b/k8s/charts/codex/values.yaml @@ -41,3 +41,6 @@ deployment: # workload: benchmarks codexNodePool: {} runnerNodePool: {} + + # Region in which to deploy machines. Leave empty to deploy to default. + region: "" diff --git a/k8s/charts/deluge/templates/_helpers.tpl b/k8s/charts/deluge/templates/_helpers.tpl index 67d6379..0424410 100644 --- a/k8s/charts/deluge/templates/_helpers.tpl +++ b/k8s/charts/deluge/templates/_helpers.tpl @@ -43,6 +43,9 @@ app.kubernetes.io/name: {{ include "app.name" . }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- if .Values.deployment.region }} +topology.kubernetes.io/region: {{ .Values.deployment.region }} +{{- end }} {{- end }} {{- define "deluge-benchmarks.selectorLabels" -}} diff --git a/k8s/charts/deluge/values.yaml b/k8s/charts/deluge/values.yaml index 860f9a1..88089cc 100644 --- a/k8s/charts/deluge/values.yaml +++ b/k8s/charts/deluge/values.yaml @@ -34,3 +34,6 @@ deployment: delugeNodePool: {} trackerNodePool: {} runnerNodePool: {} + + # Region in which to deploy machines. Leave empty to deploy to default. + region: ""