kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6362 from mikesplain/automated-cherry-pick-of-#6185-origin-release-1.11 

Automated cherry pick of #6185: Let a user specify the validation timeout when rotating a
This commit is contained in:
Justin Santa Barbara 2019-03-14 22:21:20 -04:00 committed by GitHub
parent 0f2aa8d30d 5503308d3c
commit 9285f63583
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kops/rollingupdatecluster.go
View File

@ -177,6 +177,7 @@ func NewCmdRollingUpdateCluster(f *util.Factory, out io.Writer) *cobra.Command {
cmd.Flags().BoolVar(&options.Force, "force", options.Force, "Force rolling update, even if no changes")
cmd.Flags().BoolVar(&options.CloudOnly, "cloudonly", options.CloudOnly, "Perform rolling update without confirming progress with k8s")
cmd.Flags().DurationVar(&options.ValidationTimeout, "validation-timeout", options.ValidationTimeout, "Maximum time to wait for a cluster to validate")
cmd.Flags().DurationVar(&options.MasterInterval, "master-interval", options.MasterInterval, "Time to wait between restarting masters")
cmd.Flags().DurationVar(&options.NodeInterval, "node-interval", options.NodeInterval, "Time to wait between restarting nodes")
cmd.Flags().DurationVar(&options.BastionInterval, "bastion-interval", options.BastionInterval, "Time to wait between restarting bastions")

1
docs/cli/kops_rolling-update_cluster.md
View File

@ -78,6 +78,7 @@ kops rolling-update cluster [flags]
-i, --interactive Prompt to continue after each instance is updated
--master-interval duration Time to wait between restarting masters (default 5m0s)
--node-interval duration Time to wait between restarting nodes (default 4m0s)
--validation-timeout duration Maximum time to wait for a cluster to validate (default 5m0s)
-y, --yes Perform rolling update immediately, without --yes rolling-update executes a dry-run
```