Merge pull request #956 from erikwilson/hide-disable-agent

Hide the --disable-agent flag
This commit is contained in:
Erik Wilson 2019-10-24 22:59:52 -07:00 committed by GitHub
commit 38d8a7c5e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions

View File

@ -7,8 +7,8 @@ set -e
# ENV_VAR=... ./install.sh
#
# Example:
# Installing a server without an agent:
# curl ... | INSTALL_K3S_EXEC="--disable-agent" sh -
# Installing a server without traefik:
# curl ... | INSTALL_K3S_EXEC="--no-deploy=traefik" sh -
# Installing an agent to point at a server:
# curl ... | K3S_TOKEN=xxx K3S_URL=https://server-url:6443 sh -
#
@ -52,11 +52,11 @@ set -e
# of EXEC and script args ($@).
#
# The following commands result in the same behavior:
# curl ... | INSTALL_K3S_EXEC="--disable-agent" sh -s -
# curl ... | INSTALL_K3S_EXEC="server --disable-agent" sh -s -
# curl ... | INSTALL_K3S_EXEC="server" sh -s - --disable-agent
# curl ... | sh -s - server --disable-agent
# curl ... | sh -s - --disable-agent
# curl ... | INSTALL_K3S_EXEC="--no-deploy=traefik" sh -s -
# curl ... | INSTALL_K3S_EXEC="server --no-deploy=traefik" sh -s -
# curl ... | INSTALL_K3S_EXEC="server" sh -s - --no-deploy=traefik
# curl ... | sh -s - server --no-deploy=traefik
# curl ... | sh -s - --no-deploy=traefik
#
# - INSTALL_K3S_NAME
# Name of systemd service to create, will default from the k3s exec command

View File

@ -78,6 +78,7 @@ func NewServerCommand(action func(*cli.Context) error) cli.Command {
cli.BoolFlag{
Name: "disable-agent",
Usage: "Do not run a local agent and register a local kubelet",
Hidden: true,
Destination: &ServerConfig.DisableAgent,
},
cli.StringFlag{