From 688091c9653ad7c75921c117175fda78d37748f7 Mon Sep 17 00:00:00 2001 From: gmega Date: Thu, 20 Feb 2025 11:59:24 -0300 Subject: [PATCH] feat: allow use of custom runner and node tags for Codex --- k8s/charts/codex/templates/_helpers.tpl | 6 +++--- k8s/charts/codex/values.yaml | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/k8s/charts/codex/templates/_helpers.tpl b/k8s/charts/codex/templates/_helpers.tpl index 7ee9539..1624207 100644 --- a/k8s/charts/codex/templates/_helpers.tpl +++ b/k8s/charts/codex/templates/_helpers.tpl @@ -63,14 +63,14 @@ app.kubernetes.io/part-of: {{ include "experiment.groupId" . }} cluster-autoscaler.kubernetes.io/safe-to-evict: "false" {{- end }} -{{/* Minikube env. */}} +{{/* Image settings. */}} {{- define "benchmark.harness.image" -}} -{{ .Values.deployment.minikubeEnv | ternary "bittorrent-benchmarks:minikube" "codexstorage/bittorrent-benchmarks:latest" }} +{{ .Values.deployment.minikubeEnv | ternary "bittorrent-benchmarks:minikube" (printf "codexstorage/bittorrent-benchmarks:%s" .Values.deployment.runnerTag) }} {{- end -}} {{- define "codex.image" -}} -{{ .Values.deployment.minikubeEnv | ternary "nim-codex:minikube" "codexstorage/nim-codex:latest" }} +{{ .Values.deployment.minikubeEnv | ternary "nim-codex:minikube" (printf "codexstorage/nim-codex:%s" .Values.deployment.nodeTag) }} {{- end -}} {{- define "benchmark.harness.imagePullPolicy" -}} diff --git a/k8s/charts/codex/values.yaml b/k8s/charts/codex/values.yaml index cee38f7..ea56455 100644 --- a/k8s/charts/codex/values.yaml +++ b/k8s/charts/codex/values.yaml @@ -30,6 +30,11 @@ deployment: # Disables pulling of images and uses :minikube tag for the test runner, agents, and Codex. minikubeEnv: false + # Allows overriding the tags for non-minikube images. This is useful when you're trying to + # run the experiment in the cluster but off of a Codex or benchmark harness branch. + runnerTag: "latest" + nodeTag: "latest" + # Labels for setting Deluge, tracker, and experiment runner node affinity towards pools. # Example: # codexNodePool: