Mirror
/
k3s
mirror of https://github.com/k3s-io/k3s.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix node-token path not resolving for root user in agent scripts

This commit is contained in:
David Pendray 2019-03-06 00:03:27 +00:00
parent 10be950df5
commit d7e5c86041
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/dev-agent.sh
View File

@ -1,6 +1,8 @@
#!/bin/bash
set -e
. setup-rancher-path.sh
cd $(dirname $0)/..
# Prime sudo
@ -15,4 +17,4 @@ else
fi
echo Starting agent
sudo env "PATH=$(pwd)/bin:$PATH" ./bin/k3s-agent --debug agent -s https://localhost:6443 -t $(<${HOME}/.rancher/k3s/server/node-token) "$@"
sudo env "PATH=$(pwd)/bin:$PATH" ./bin/k3s-agent --debug agent -s https://localhost:6443 -t $(<${RANCHER_PATH}/k3s/server/node-token) "$@"

4
scripts/dev-docker-agent.sh
View File

@ -1,5 +1,7 @@
#!/bin/bash
. setup-rancher-path.sh
cd $(dirname $0)/..
IP=$(ip addr show dev docker0 | grep -w inet | awk '{print $2}' | cut -f1 -d/)
docker run \
@ -16,4 +18,4 @@ docker run \
-v /var/lib/cni \
-v /usr/lib/x86_64-linux-gnu/libsqlite3.so.0:/usr/lib/x86_64-linux-gnu/libsqlite3.so.0:ro \
--privileged \
ubuntu:18.04 /usr/bin/k3s-agent agent -t $(<~/.rancher/k3s/server/node-token) -s https://${IP}:6443
ubuntu:18.04 /usr/bin/k3s-agent agent -t $(<${RANCHER_PATH}/k3s/server/node-token) -s https://${IP}:6443

7
scripts/setup-rancher-path.sh Executable file
View File

@ -0,0 +1,7 @@
#!/bin/bash
if [ $(id -u) = 0 ]; then
RANCHER_PATH="/var/lib/rancher"
else
RANCHER_PATH="$HOME/.rancher"
fi