From fc0630224f171f5e31853cc5f6c2a52437af7418 Mon Sep 17 00:00:00 2001 From: gmega Date: Fri, 10 Jan 2025 16:31:12 -0300 Subject: [PATCH] fix: remove redundant group suffix from node ID --- analysis/{ => exploratory}/collect-logs.sh | 0 analysis/{ => exploratory}/deluge-exploratory-analysis.Rmd | 0 k8s/charts/deluge/templates/deluge-statefulset.yaml | 4 +--- 3 files changed, 1 insertion(+), 3 deletions(-) rename analysis/{ => exploratory}/collect-logs.sh (100%) rename analysis/{ => exploratory}/deluge-exploratory-analysis.Rmd (100%) diff --git a/analysis/collect-logs.sh b/analysis/exploratory/collect-logs.sh similarity index 100% rename from analysis/collect-logs.sh rename to analysis/exploratory/collect-logs.sh diff --git a/analysis/deluge-exploratory-analysis.Rmd b/analysis/exploratory/deluge-exploratory-analysis.Rmd similarity index 100% rename from analysis/deluge-exploratory-analysis.Rmd rename to analysis/exploratory/deluge-exploratory-analysis.Rmd diff --git a/k8s/charts/deluge/templates/deluge-statefulset.yaml b/k8s/charts/deluge/templates/deluge-statefulset.yaml index 255c5a5..5dfb1b4 100644 --- a/k8s/charts/deluge/templates/deluge-statefulset.yaml +++ b/k8s/charts/deluge/templates/deluge-statefulset.yaml @@ -27,8 +27,6 @@ spec: ports: - containerPort: 6890 env: - - name: EXPERIMENT_GROUP_ID - value: {{ include "experiment.groupId" . }} - name: CLIENT_POD_NAME valueFrom: fieldRef: @@ -42,7 +40,7 @@ spec: command: [ "/bin/bash", "--login", "-c" ] args: - | - export DELUGE_NODE_ID=${CLIENT_POD_NAME}-${EXPERIMENT_GROUP_ID} + export DELUGE_NODE_ID=${CLIENT_POD_NAME} # Sadly we can't mount a subpath, so need add the correct prefix # into all of the config directories. export DELUGE_CONFIG_DIR=/var/lib/deluge/${CLIENT_POD_NAME}