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

Deprecate the --timeout option

Browse Source 
Use --wait <timeout> instead
This commit is contained in:
Andy Zhou 2019-05-20 13:47:16 -07:00
parent ba231f550d
commit 3683eeb181
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cli/commands.go
View File

@ -84,10 +84,6 @@ func CreateCluster(c *cli.Context) error {
} }
log.Printf("Created cluster network with ID %s", networkID) log.Printf("Created cluster network with ID %s", networkID)
if c.IsSet("timeout") && !c.IsSet("wait") {
return errors.New("Cannot use --timeout flag without --wait flag")
}
// environment variables // environment variables
env := []string{"K3S_KUBECONFIG_OUTPUT=/output/kubeconfig.yaml"} env := []string{"K3S_KUBECONFIG_OUTPUT=/output/kubeconfig.yaml"}
if c.IsSet("env") || c.IsSet("e") { if c.IsSet("env") || c.IsSet("e") {
@ -142,11 +138,15 @@ func CreateCluster(c *cli.Context) error {
return err 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. // 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 // 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 // TODO: also wait for worker nodes
start := time.Now() start := time.Now()
timeout := time.Duration(c.Int("timeout")) * time.Second timeout := time.Duration(c.Int("wait")) * time.Second
for c.IsSet("wait") { for c.IsSet("wait") {
// not running after timeout exceeded? Rollback and delete everything. // not running after timeout exceeded? Rollback and delete everything.
if timeout != 0 && !time.Now().After(start.Add(timeout)) { if timeout != 0 && !time.Now().After(start.Add(timeout)) {

7
main.go
View File

@ -83,11 +83,12 @@ func main() {
cli.IntFlag{ cli.IntFlag{
Name: "timeout, t", Name: "timeout, t",
Value: 0, Value: 0,
Usage: "Set the timeout value when --wait flag is set", Usage: "Set the timeout value when --wait flag is set (deprecated, use --wait <timeout> instead)",
}, },
cli.BoolFlag{ cli.IntFlag{
Name: "wait, w", Name: "wait, w",
Usage: "Wait for the cluster to come up before returning", Value: 0, // timeout
Usage: "Wait for the cluster to come up before returning until timoout (in seconds). Use --wait 0 to wait forever",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "image, i", Name: "image, i",