public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-08-05 08:09:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken K3S_TOKEN env

Browse Source
This commit is contained in:
Erik Wilson
2019-11-14 12:42:42 -07:00
parent 35715bd9ec
commit 95ff805c98
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/cli/cmds/server.go
View File

@@ -12,6 +12,7 @@ type Server struct {
AgentTokenFile string
Token string
TokenFile string
ClusterSecret string
ServiceCIDR string
ClusterDNS string
ClusterDomain string
@@ -121,7 +122,7 @@ func NewServerCommand(action func(*cli.Context) error) cli.Command {
Name: "token,t",
Usage: "(cluster) Shared secret used to join a server or agent to a cluster",
Destination: &ServerConfig.Token,
EnvVar: "K3S_CLUSTER_SECRET,K3S_TOKEN",
EnvVar: "K3S_TOKEN",
},
cli.StringFlag{
Name: "token-file",
@@ -231,7 +232,7 @@ func NewServerCommand(action func(*cli.Context) error) cli.Command {
},
cli.StringFlag{
Name: "agent-token",
Usage: "(experimental/cluster) Shared secret used to join agents to the cluster, but not agents",
Usage: "(experimental/cluster) Shared secret used to join agents to the cluster, but not servers",
Destination: &ServerConfig.AgentToken,
EnvVar: "K3S_AGENT_TOKEN",
},
@@ -268,7 +269,7 @@ func NewServerCommand(action func(*cli.Context) error) cli.Command {
cli.StringFlag{
Name: "cluster-secret",
Usage: "(deprecated) use --token",
Destination: &ServerConfig.Token,
Destination: &ServerConfig.ClusterSecret,
EnvVar: "K3S_CLUSTER_SECRET",
},
cli.BoolFlag{