Skip to content

Commit

Permalink
Merge pull request #17214 from justinsb/reconcile_dryrun_should_be_an…
Browse files Browse the repository at this point in the history
…_update

reconcile: if --yes is not provided, print the same output as `update cluster` does
  • Loading branch information
k8s-ci-robot authored Jan 15, 2025
2 parents 90edbe4 + 48f12be commit 961a786
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions cmd/kops/reconcile_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,19 @@ func NewCmdReconcileCluster(f *util.Factory, out io.Writer) *cobra.Command {
// "update" is probably now smart enough to automatically not update the control plane if it is already at the desired version,
// but we do it explicitly here to be clearer / safer.
func RunReconcileCluster(ctx context.Context, f *util.Factory, out io.Writer, c *CoreUpdateClusterOptions) error {
if !c.Yes {
return fmt.Errorf("reconcile is only supported with --yes")
}
if c.Target == cloudup.TargetTerraform {
return fmt.Errorf("reconcile is not supported with terraform")
}

if !c.Yes {
// A reconcile without --yes is the same as a dry run
opt := *c
if _, err := RunCoreUpdateCluster(ctx, f, out, &opt); err != nil {
return err
}
return nil
}

fmt.Fprintf(out, "Updating control plane configuration\n")
{
opt := *c
Expand Down

0 comments on commit 961a786

Please sign in to comment.