Merge pull request #176 from jakefhyde/data-dir-rfc

Add support for CATTLE_AGENT_VAR_DIR in suc plan
rancher · Jul 3, 2024 · bf4eb09 · bf4eb09
2 parents b2ef254 + be9a514
commit bf4eb09
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/package/Dockerfile.suc b/package/Dockerfile.suc
@@ -12,6 +12,8 @@ RUN /usr/bin/kubectl version --client
 ARG ALPINE=alpine:3.18
 FROM ${ALPINE}
 
+ENV CATTLE_AGENT_VAR_DIR="/var/lib/rancher/agent"
+
 RUN mkdir /opt/rancher-system-agent-suc
 COPY install.sh /opt/rancher-system-agent-suc/install.sh
 COPY system-agent-uninstall.sh /opt/rancher-system-agent-suc/system-agent-uninstall.sh

diff --git a/package/suc/run.sh b/package/suc/run.sh
@@ -2,7 +2,8 @@
 
 set -x -e
 
-TMPDIRBASE=/var/lib/rancher/agent/tmp
+CATTLE_AGENT_VAR_DIR=${CATTLE_AGENT_VAR_DIR:-/var/lib/rancher/agent}
+TMPDIRBASE=${CATTLE_AGENT_VAR_DIR}/tmp
 
 mkdir -p "/host${TMPDIRBASE}"