mirror of https://github.com/knative/client.git
fix(service): Set default timeout for update to the same value as for create (#446)
Also, added accidentally removed seperator lines during create/update
This commit is contained in:
parent
039cdfcc09
commit
6328a73c98
|
@ -61,7 +61,7 @@ kn service update NAME [flags]
|
||||||
--tag strings Set tag (format: --tag revisionRef=tagName) where revisionRef can be a revision or '@latest' string representing latest ready revision. This flag can be specified multiple times.
|
--tag strings Set tag (format: --tag revisionRef=tagName) where revisionRef can be a revision or '@latest' string representing latest ready revision. This flag can be specified multiple times.
|
||||||
--traffic strings Set traffic distribution (format: --traffic revisionRef=percent) where revisionRef can be a revision or a tag or '@latest' string representing latest ready revision. This flag can be given multiple times with percent summing up to 100%.
|
--traffic strings Set traffic distribution (format: --traffic revisionRef=percent) where revisionRef can be a revision or a tag or '@latest' string representing latest ready revision. This flag can be given multiple times with percent summing up to 100%.
|
||||||
--untag strings Untag revision (format: --untag tagName). This flag can be spcified multiple times.
|
--untag strings Untag revision (format: --untag tagName). This flag can be spcified multiple times.
|
||||||
--wait-timeout int Seconds to wait before giving up on waiting for service to be ready. (default 60)
|
--wait-timeout int Seconds to wait before giving up on waiting for service to be ready. (default 600)
|
||||||
```
|
```
|
||||||
|
|
||||||
### Options inherited from parent commands
|
### Options inherited from parent commands
|
||||||
|
|
|
@ -114,7 +114,7 @@ func NewServiceCreateCommand(p *commands.KnParams) *cobra.Command {
|
||||||
}
|
}
|
||||||
commands.AddNamespaceFlags(serviceCreateCommand.Flags(), false)
|
commands.AddNamespaceFlags(serviceCreateCommand.Flags(), false)
|
||||||
editFlags.AddCreateFlags(serviceCreateCommand)
|
editFlags.AddCreateFlags(serviceCreateCommand)
|
||||||
waitFlags.AddConditionWaitFlags(serviceCreateCommand, 600, "Create", "service")
|
waitFlags.AddConditionWaitFlags(serviceCreateCommand, commands.WaitDefaultTimeout, "Create", "service")
|
||||||
return serviceCreateCommand
|
return serviceCreateCommand
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -188,10 +188,12 @@ func prepareAndUpdateService(client serving_kn_v1alpha1.KnServingClient, service
|
||||||
}
|
}
|
||||||
|
|
||||||
func waitForServiceToGetReady(client serving_kn_v1alpha1.KnServingClient, name string, timeout int, verbDone string, out io.Writer) error {
|
func waitForServiceToGetReady(client serving_kn_v1alpha1.KnServingClient, name string, timeout int, verbDone string, out io.Writer) error {
|
||||||
|
fmt.Fprintln(out, "")
|
||||||
err := waitForService(client, name, out, timeout)
|
err := waitForService(client, name, out, timeout)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
fmt.Fprintln(out, "")
|
||||||
return showUrl(client, name, "", verbDone, out)
|
return showUrl(client, name, "", verbDone, out)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -68,6 +68,6 @@ func showUrl(client serving_kn_v1alpha1.KnServingClient, serviceName string, ori
|
||||||
if originalRevision != "" && originalRevision == newRevision {
|
if originalRevision != "" && originalRevision == newRevision {
|
||||||
revisionUpdateStatus = " (unchanged)"
|
revisionUpdateStatus = " (unchanged)"
|
||||||
}
|
}
|
||||||
fmt.Fprintf(out, "\nService '%s' %s with latest revision '%s'%s and URL:\n%s\n", serviceName, what, newRevision, revisionUpdateStatus, url)
|
fmt.Fprintf(out, "Service '%s' %s with latest revision '%s'%s and URL:\n%s\n", serviceName, what, newRevision, revisionUpdateStatus, url)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -115,10 +115,12 @@ func NewServiceUpdateCommand(p *commands.KnParams) *cobra.Command {
|
||||||
out := cmd.OutOrStdout()
|
out := cmd.OutOrStdout()
|
||||||
if !waitFlags.Async {
|
if !waitFlags.Async {
|
||||||
fmt.Fprintf(out, "Updating Service '%s' in namespace '%s':\n", args[0], namespace)
|
fmt.Fprintf(out, "Updating Service '%s' in namespace '%s':\n", args[0], namespace)
|
||||||
|
fmt.Fprintln(out, "")
|
||||||
err := waitForService(client, name, out, waitFlags.TimeoutInSeconds)
|
err := waitForService(client, name, out, waitFlags.TimeoutInSeconds)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
fmt.Fprintln(out, "")
|
||||||
return showUrl(client, name, latestRevisionBeforeUpdate, "updated", out)
|
return showUrl(client, name, latestRevisionBeforeUpdate, "updated", out)
|
||||||
} else {
|
} else {
|
||||||
fmt.Fprintf(out, "Service '%s' updated in namespace '%s'.\n", args[0], namespace)
|
fmt.Fprintf(out, "Service '%s' updated in namespace '%s'.\n", args[0], namespace)
|
||||||
|
@ -134,7 +136,7 @@ func NewServiceUpdateCommand(p *commands.KnParams) *cobra.Command {
|
||||||
|
|
||||||
commands.AddNamespaceFlags(serviceUpdateCommand.Flags(), false)
|
commands.AddNamespaceFlags(serviceUpdateCommand.Flags(), false)
|
||||||
editFlags.AddUpdateFlags(serviceUpdateCommand)
|
editFlags.AddUpdateFlags(serviceUpdateCommand)
|
||||||
waitFlags.AddConditionWaitFlags(serviceUpdateCommand, 60, "Update", "service")
|
waitFlags.AddConditionWaitFlags(serviceUpdateCommand, commands.WaitDefaultTimeout, "Update", "service")
|
||||||
trafficFlags.Add(serviceUpdateCommand)
|
trafficFlags.Add(serviceUpdateCommand)
|
||||||
return serviceUpdateCommand
|
return serviceUpdateCommand
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,6 +20,11 @@ import (
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Default time out to use when waiting for reconciliation. It is deliberately very long as it is expected that
|
||||||
|
// the service doesn't stay in `Unknown` status very long and eventually ends up as `False` or `True` in a timely
|
||||||
|
// manner
|
||||||
|
const WaitDefaultTimeout = 600
|
||||||
|
|
||||||
// Flags for tuning wait behaviour
|
// Flags for tuning wait behaviour
|
||||||
type WaitFlags struct {
|
type WaitFlags struct {
|
||||||
// Timeout in seconds for how long to wait for a command to return
|
// Timeout in seconds for how long to wait for a command to return
|
||||||
|
|
Loading…
Reference in New Issue