mirrors/k3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #76 from andyz-dev/no-timeout

Browse Source 
[Enhancement] Deprecate --timeout, shift short hand options around
This commit is contained in:
Thorsten Klein 2019-06-07 15:00:32 +02:00 committed by GitHub
commit 5ebe276162
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/commands.go
View File

@ -161,10 +161,6 @@ func CreateCluster(c *cli.Context) error {
return err
}
if c.IsSet("timeout") {
log.Println("[Warning] The --timeout flag is deprecated. use '--wait <timeout>' instead")
}
// Wait for k3s to be up and running if wanted.
// We're simply scanning the container logs for a line that tells us that everything's up and running
// TODO: also wait for worker nodes

9
main.go
View File

@ -103,12 +103,7 @@ func main() {
Usage: "Specify the Kubernetes cluster API server port (Format: `[host:]port` (Note: --port/-p will be used for arbitrary port mapping as of v2.0.0, use --api-port/-a instead for setting the api port)",
},
cli.IntFlag{
Name: "timeout, t",
Value: 0,
Usage: "Set the timeout value when --wait flag is set (deprecated, use --wait <timeout> instead)",
},
cli.IntFlag{
Name: "wait, w",
Name: "wait, t",
Value: 0, // timeout
Usage: "Wait for the cluster to come up before returning until timoout (in seconds). Use --wait 0 to wait forever",
},
@ -126,7 +121,7 @@ func main() {
Usage: "Pass an additional environment variable (new flag per variable)",
},
cli.IntFlag{
Name: "workers",
Name: "workers, w",
Value: 0,
Usage: "Specify how many worker nodes you want to spawn",
},