Merge pull request #1847 from ericleu/patch_install.sh

update install.sh to respect K3S_TOKEN_FILE
4 years ago · fd933c936f
parent 447097a597 b966ad18da
commit fd933c936f
1 changed files with 2 additions and 2 deletions
--- a/install.sh
+++ b/install.sh
@ -163,8 +163,8 @@ setup_env() {
            if [ -z "${K3S_URL}" ]; then
                CMD_K3S=server
            else
-                if [ -z "${K3S_TOKEN}" ] && [ -z "${K3S_CLUSTER_SECRET}" ]; then
+                if [ -z "${K3S_TOKEN}" ] && [ -z "${K3S_TOKEN_FILE}" ] && [ -z "${K3S_CLUSTER_SECRET}" ]; then
-                    fatal "Defaulted k3s exec command to 'agent' because K3S_URL is defined, but K3S_TOKEN or K3S_CLUSTER_SECRET is not defined."
+                    fatal "Defaulted k3s exec command to 'agent' because K3S_URL is defined, but K3S_TOKEN, K3S_TOKEN_FILE or K3S_CLUSTER_SECRET is not defined."
                fi
                CMD_K3S=agent
            fi