diff --git a/cmd/uc/machine/add.go b/cmd/uc/machine/add.go index 4f9e3e6a..3adbbfea 100644 --- a/cmd/uc/machine/add.go +++ b/cmd/uc/machine/add.go @@ -40,6 +40,9 @@ func NewAddCommand() *cobra.Command { Short: "Add a remote machine to a cluster.", Long: `Add a new machine to an existing Uncloud cluster. +By default, it installs Docker and the Uncloud daemon on the machine over SSH unless --no-install +is specified, which assumes they are already installed and running. + Connection methods: [ssh://]user@host - Use system 'ssh' command with full SSH config support (default, no prefix required) ssh+go://user@host - Use Go's built-in SSH library`, @@ -79,7 +82,7 @@ Connection methods: ) cmd.Flags().BoolVar( &opts.noInstall, "no-install", false, - "Skip installation of Docker, Uncloud daemon, and dependencies on the machine. "+ + "Skip installation of Docker and the Uncloud daemon on the machine. "+ "Assumes they're already installed and running.", ) cmd.Flags().StringVar( diff --git a/cmd/uc/machine/init.go b/cmd/uc/machine/init.go index c4c95bb3..19a16b3c 100644 --- a/cmd/uc/machine/init.go +++ b/cmd/uc/machine/init.go @@ -45,6 +45,9 @@ func NewInitCommand() *cobra.Command { Long: `Initialise a new cluster by setting up a remote machine as the first member. This command creates a new context in your Uncloud config to manage the cluster. +By default, it installs Docker and the Uncloud daemon on the machine over SSH unless --no-install +is specified, which assumes they are already installed and running. + Connection methods: [ssh://]user@host - Use system 'ssh' command with full SSH config support (default, no prefix required) ssh+go://user@host - Use Go's built-in SSH library`, @@ -117,7 +120,7 @@ Connection methods: ) cmd.Flags().BoolVar( &opts.noInstall, "no-install", false, - "Skip installation of Docker, Uncloud daemon, and dependencies on the machine. "+ + "Skip installation of Docker and the Uncloud daemon on the machine. "+ "Assumes they're already installed and running.", ) cmd.Flags().StringVar( diff --git a/website/docs/9-cli-reference/uc_machine_add.md b/website/docs/9-cli-reference/uc_machine_add.md index 323147fd..017d2d09 100644 --- a/website/docs/9-cli-reference/uc_machine_add.md +++ b/website/docs/9-cli-reference/uc_machine_add.md @@ -6,6 +6,9 @@ Add a remote machine to a cluster. Add a new machine to an existing Uncloud cluster. +By default, it installs Docker and the Uncloud daemon on the machine over SSH unless --no-install +is specified, which assumes they are already installed and running. + Connection methods: [ssh://]user@host - Use system 'ssh' command with full SSH config support (default, no prefix required) ssh+go://user@host - Use Go's built-in SSH library @@ -20,7 +23,7 @@ uc machine add [USER@]HOST[:PORT] [flags] -h, --help help for add -n, --name string Assign a name to the machine. (default is the machine's hostname) --no-caddy Don't deploy Caddy reverse proxy service to the machine. - --no-install Skip installation of Docker, Uncloud daemon, and dependencies on the machine. Assumes they're already installed and running. + --no-install Skip installation of Docker and the Uncloud daemon on the machine. Assumes they're already installed and running. --public-ip string Public IP address of the machine for ingress configuration. Use 'auto' for automatic detection, blank '' or 'none' to disable ingress on this machine, or specify an IP address. (default "auto") -i, --ssh-key string Path to SSH private key for remote login (if not already added to SSH agent). (default "~/.ssh/id_ed25519") --version string Version of the Uncloud daemon to install on the machine. (default "latest") diff --git a/website/docs/9-cli-reference/uc_machine_init.md b/website/docs/9-cli-reference/uc_machine_init.md index 855f702a..3197cbe0 100644 --- a/website/docs/9-cli-reference/uc_machine_init.md +++ b/website/docs/9-cli-reference/uc_machine_init.md @@ -7,6 +7,9 @@ Initialise a new cluster with a remote machine as the first member. Initialise a new cluster by setting up a remote machine as the first member. This command creates a new context in your Uncloud config to manage the cluster. +By default, it installs Docker and the Uncloud daemon on the machine over SSH unless --no-install +is specified, which assumes they are already installed and running. + Connection methods: [ssh://]user@host - Use system 'ssh' command with full SSH config support (default, no prefix required) ssh+go://user@host - Use Go's built-in SSH library @@ -42,7 +45,7 @@ uc machine init [schema://]USER@HOST[:PORT] [flags] --network string IPv4 network CIDR to use for machines and services. (default "10.210.0.0/16") --no-caddy Don't deploy Caddy reverse proxy service to the machine. You can deploy it later with 'uc caddy deploy'. --no-dns Don't reserve a cluster domain in Uncloud DNS. You can reserve it later with 'uc dns reserve'. - --no-install Skip installation of Docker, Uncloud daemon, and dependencies on the machine. Assumes they're already installed and running. + --no-install Skip installation of Docker and the Uncloud daemon on the machine. Assumes they're already installed and running. --public-ip string Public IP address of the machine for ingress configuration. Use 'auto' for automatic detection, blank '' or 'none' to disable ingress on this machine, or specify an IP address. (default "auto") -i, --ssh-key string Path to SSH private key for remote login (if not already added to SSH agent). (default "~/.ssh/id_ed25519") --version string Version of the Uncloud daemon to install on the machine. (default "latest")