From be9a5146c88f260aa7ffde4d8dc975eca5f6be37 Mon Sep 17 00:00:00 2001 From: Jake Hyde Date: Wed, 3 Jul 2024 14:17:41 -0400 Subject: [PATCH] Add support for CATTLE_AGENT_VAR_DIR in suc plan --- package/Dockerfile.suc | 2 ++ package/suc/run.sh | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/Dockerfile.suc b/package/Dockerfile.suc index 16d8aa4e..d866ba1a 100644 --- 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 index 3dba7e58..5c96da8c 100755 --- 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}"