Merge pull request #17226 from justinsb/automated-cherry-pick-of-#172…

…20-release-1.31 Automated cherry pick of #17220: Remove reconcile flag from `kops update`
kubernetes · Jan 21, 2025 · 0244b37 · 0244b37
2 parents 833a6c3 + e38ce17
commit 0244b37
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/cmd/kops/update_cluster.go b/cmd/kops/update_cluster.go
@@ -187,8 +187,6 @@ func NewCmdUpdateCluster(f *util.Factory, out io.Writer) *cobra.Command {
 	cmd.Flags().BoolVar(&options.Prune, "prune", options.Prune, "Delete old revisions of cloud resources that were needed during an upgrade")
 	cmd.Flags().BoolVar(&options.IgnoreKubeletVersionSkew, "ignore-kubelet-version-skew", options.IgnoreKubeletVersionSkew, "Setting this to true will force updating the kubernetes version on all instance groups, regardles of which control plane version is running")
 
-	cmd.Flags().BoolVar(&options.Reconcile, "reconcile", options.Reconcile, "Reconcile the cluster by rolling the control plane and nodes sequentially")
-
 	return cmd
 }
 
@@ -216,10 +214,6 @@ func RunCoreUpdateCluster(ctx context.Context, f *util.Factory, out io.Writer, c
 }
 
 func RunUpdateCluster(ctx context.Context, f *util.Factory, out io.Writer, c *UpdateClusterOptions) (*UpdateClusterResults, error) {
-	if c.Reconcile {
-		return nil, RunReconcileCluster(ctx, f, out, &c.CoreUpdateClusterOptions)
-	}
-
 	results := &UpdateClusterResults{}
 
 	isDryrun := false

diff --git a/docs/cli/kops_update_cluster.md b/docs/cli/kops_update_cluster.md