Skip to content

Commit 396551b

Browse files
juanvallejojuanvallejo
committed
rename global flag to --request-timeout; revert local flag changes
1 parent dd809e8 commit 396551b

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

‎pkg/client/unversioned/clientcmd/overrides.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ const (
138138
FlagImpersonate = "as"
139139
FlagUsername = "username"
140140
FlagPassword = "password"
141-
FlagTimeout = "timeout"
141+
FlagTimeout = "request-timeout"
142142
)
143143

144144
// RecommendedAuthOverrideFlags is a convenience method to return recommended flag names prefixed with a string of your choosing

‎pkg/kubectl/cmd/delete.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func NewCmdDelete(f *cmdutil.Factory, out io.Writer) *cobra.Command {
102102
cmd.Flags().Bool("cascade", true, "If true, cascade the deletion of the resources managed by this resource (e.g. Pods created by a ReplicationController). Default true.")
103103
cmd.Flags().Int("grace-period", -1, "Period of time in seconds given to the resource to terminate gracefully. Ignored if negative.")
104104
cmd.Flags().Bool("now", false, "If true, resources are force terminated without graceful deletion (same as --grace-period=0).")
105-
cmd.Flags().Duration("delete-timeout", 0, "The length of time to wait before giving up on a delete, zero means determine a timeout from the size of the object")
105+
cmd.Flags().Duration("timeout", 0, "The length of time to wait before giving up on a delete, zero means determine a timeout from the size of the object")
106106
cmdutil.AddOutputFlagsForMutation(cmd)
107107
cmdutil.AddInclude3rdPartyFlags(cmd)
108108
return cmd
@@ -153,7 +153,7 @@ func RunDelete(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []str
153153
shortOutput := cmdutil.GetFlagString(cmd, "output") == "name"
154154
// By default use a reaper to delete all related resources.
155155
if cmdutil.GetFlagBool(cmd, "cascade") {
156-
return ReapResult(r, f, out, cmdutil.GetFlagBool(cmd, "cascade"), ignoreNotFound, cmdutil.GetFlagDuration(cmd, "delete-timeout"), gracePeriod, shortOutput, mapper, false)
156+
return ReapResult(r, f, out, cmdutil.GetFlagBool(cmd, "cascade"), ignoreNotFound, cmdutil.GetFlagDuration(cmd, "timeout"), gracePeriod, shortOutput, mapper, false)
157157
}
158158
return DeleteResult(r, out, ignoreNotFound, shortOutput, mapper)
159159
}

‎pkg/kubectl/cmd/replace.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func NewCmdReplace(f *cmdutil.Factory, out io.Writer) *cobra.Command {
8080
cmd.Flags().Bool("force", false, "Delete and re-create the specified resource")
8181
cmd.Flags().Bool("cascade", false, "Only relevant during a force replace. If true, cascade the deletion of the resources managed by this resource (e.g. Pods created by a ReplicationController).")
8282
cmd.Flags().Int("grace-period", -1, "Only relevant during a force replace. Period of time in seconds given to the old resource to terminate gracefully. Ignored if negative.")
83-
cmd.Flags().Duration("delete-timeout", 0, "Only relevant during a force replace. The length of time to wait before giving up on a delete of the old resource, zero means determine a timeout from the size of the object. Any other values should contain a corresponding time unit (e.g. 1s, 2m, 3h).")
83+
cmd.Flags().Duration("timeout", 0, "Only relevant during a force replace. The length of time to wait before giving up on a delete of the old resource, zero means determine a timeout from the size of the object. Any other values should contain a corresponding time unit (e.g. 1s, 2m, 3h).")
8484
cmdutil.AddValidateFlags(cmd)
8585
cmdutil.AddOutputFlagsForMutation(cmd)
8686
cmdutil.AddApplyAnnotationFlags(cmd)
@@ -118,8 +118,8 @@ func RunReplace(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []st
118118
return fmt.Errorf("--grace-period must have --force specified")
119119
}
120120

121-
if cmdutil.GetFlagDuration(cmd, "delete-timeout") != 0 {
122-
return fmt.Errorf("--delete-timeout must have --force specified")
121+
if cmdutil.GetFlagDuration(cmd, "timeout") != 0 {
122+
return fmt.Errorf("--timeout must have --force specified")
123123
}
124124

125125
mapper, typer := f.Object()
@@ -207,7 +207,7 @@ func forceReplace(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []
207207
}
208208
//Replace will create a resource if it doesn't exist already, so ignore not found error
209209
ignoreNotFound := true
210-
timeout := cmdutil.GetFlagDuration(cmd, "delete-timeout")
210+
timeout := cmdutil.GetFlagDuration(cmd, "timeout")
211211
// By default use a reaper to delete all related resources.
212212
if cmdutil.GetFlagBool(cmd, "cascade") {
213213
glog.Warningf("\"cascade\" is set, kubectl will delete and re-create all resources managed by this resource (e.g. Pods created by a ReplicationController). Consider using \"kubectl rolling-update\" if you want to update a ReplicationController together with its Pods.")

‎pkg/kubectl/cmd/rollingupdate.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func NewCmdRollingUpdate(f *cmdutil.Factory, out io.Writer) *cobra.Command {
9191
}
9292
cmd.Flags().Duration("update-period", updatePeriod, `Time to wait between updating pods. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".`)
9393
cmd.Flags().Duration("poll-interval", pollInterval, `Time delay between polling for replication controller status after the update. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".`)
94-
cmd.Flags().Duration("update-timeout", timeout, `Max time to wait for a replication controller to update before giving up. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".`)
94+
cmd.Flags().Duration("timeout", timeout, `Max time to wait for a replication controller to update before giving up. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".`)
9595
usage := "Filename or URL to file to use to create the new replication controller."
9696
kubectl.AddJsonFilenameFlag(cmd, &options.Filenames, usage)
9797
cmd.MarkFlagRequired("filename")
@@ -158,7 +158,7 @@ func RunRollingUpdate(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, arg
158158
rollback := cmdutil.GetFlagBool(cmd, "rollback")
159159
period := cmdutil.GetFlagDuration(cmd, "update-period")
160160
interval := cmdutil.GetFlagDuration(cmd, "poll-interval")
161-
timeout := cmdutil.GetFlagDuration(cmd, "update-timeout")
161+
timeout := cmdutil.GetFlagDuration(cmd, "timeout")
162162
dryrun := cmdutil.GetDryRunFlag(cmd)
163163
outputFormat := cmdutil.GetFlagString(cmd, "output")
164164
container := cmdutil.GetFlagString(cmd, "container")

‎pkg/kubectl/cmd/scale.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func NewCmdScale(f *cmdutil.Factory, out io.Writer) *cobra.Command {
8282
cmd.Flags().Int("current-replicas", -1, "Precondition for current size. Requires that the current size of the resource match this value in order to scale.")
8383
cmd.Flags().Int("replicas", -1, "The new desired number of replicas. Required.")
8484
cmd.MarkFlagRequired("replicas")
85-
cmd.Flags().Duration("scale-timeout", 0, "The length of time to wait before giving up on a scale operation, zero means don't wait. Any other values should contain a corresponding time unit (e.g. 1s, 2m, 3h).")
85+
cmd.Flags().Duration("timeout", 0, "The length of time to wait before giving up on a scale operation, zero means don't wait. Any other values should contain a corresponding time unit (e.g. 1s, 2m, 3h).")
8686
cmdutil.AddOutputFlagsForMutation(cmd)
8787
cmdutil.AddRecordFlag(cmd)
8888
cmdutil.AddInclude3rdPartyFlags(cmd)
@@ -154,7 +154,7 @@ func RunScale(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []stri
154154
retry := kubectl.NewRetryParams(kubectl.Interval, kubectl.Timeout)
155155

156156
var waitForReplicas *kubectl.RetryParams
157-
if timeout := cmdutil.GetFlagDuration(cmd, "scale-timeout"); timeout != 0 {
157+
if timeout := cmdutil.GetFlagDuration(cmd, "timeout"); timeout != 0 {
158158
waitForReplicas = kubectl.NewRetryParams(kubectl.Interval, timeout)
159159
}
160160

‎pkg/kubectl/cmd/stop.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func NewCmdStop(f *cmdutil.Factory, out io.Writer) *cobra.Command {
6969
cmd.Flags().Bool("all", false, "[-all] to select all the specified resources.")
7070
cmd.Flags().Bool("ignore-not-found", false, "Treat \"resource not found\" as a successful stop.")
7171
cmd.Flags().Int("grace-period", -1, "Period of time in seconds given to the resource to terminate gracefully. Ignored if negative.")
72-
cmd.Flags().Duration("delete-timeout", 0, "The length of time to wait before giving up on a delete, zero means determine a timeout from the size of the object")
72+
cmd.Flags().Duration("timeout", 0, "The length of time to wait before giving up on a delete, zero means determine a timeout from the size of the object")
7373
cmdutil.AddOutputFlagsForMutation(cmd)
7474
cmdutil.AddInclude3rdPartyFlags(cmd)
7575
return cmd
@@ -95,5 +95,5 @@ func RunStop(f *cmdutil.Factory, cmd *cobra.Command, args []string, out io.Write
9595
return r.Err()
9696
}
9797
shortOutput := cmdutil.GetFlagString(cmd, "output") == "name"
98-
return ReapResult(r, f, out, false, cmdutil.GetFlagBool(cmd, "ignore-not-found"), cmdutil.GetFlagDuration(cmd, "delete-timeout"), cmdutil.GetFlagInt(cmd, "grace-period"), shortOutput, mapper, false)
98+
return ReapResult(r, f, out, false, cmdutil.GetFlagBool(cmd, "ignore-not-found"), cmdutil.GetFlagDuration(cmd, "timeout"), cmdutil.GetFlagInt(cmd, "grace-period"), shortOutput, mapper, false)
9999
}

0 commit comments

Comments
 (0)