From 5ac11aa55addf5b642bb876bc09988a5f373c32e Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Sun, 23 Feb 2025 21:04:31 -0600 Subject: [PATCH] Cleanup logging for reconcile cluster --- cmd/kops/reconcile_cluster.go | 4 ++-- cmd/kops/rolling-update_cluster.go | 1 - cmd/kops/update_cluster.go | 2 +- pkg/instancegroups/rollingupdate.go | 5 ++++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cmd/kops/reconcile_cluster.go b/cmd/kops/reconcile_cluster.go index 53aedbc88f6b6..d54d469372c95 100644 --- a/cmd/kops/reconcile_cluster.go +++ b/cmd/kops/reconcile_cluster.go @@ -166,7 +166,7 @@ func RunReconcileCluster(ctx context.Context, f *util.Factory, out io.Writer, c } } - fmt.Fprintf(out, "Doing rolling-update for control plane\n") + fmt.Fprintf(out, "Performing rolling-update for control plane\n") { opt := &RollingUpdateOptions{} opt.InitDefaults() @@ -192,7 +192,7 @@ func RunReconcileCluster(ctx context.Context, f *util.Factory, out io.Writer, c } } - fmt.Fprintf(out, "Doing rolling-update for nodes\n") + fmt.Fprintf(out, "Performing rolling-update for nodes\n") { opt := &RollingUpdateOptions{} opt.InitDefaults() diff --git a/cmd/kops/rolling-update_cluster.go b/cmd/kops/rolling-update_cluster.go index ad3fb0e0b92ec..f9889505bbbe4 100644 --- a/cmd/kops/rolling-update_cluster.go +++ b/cmd/kops/rolling-update_cluster.go @@ -285,7 +285,6 @@ func RunRollingUpdateCluster(ctx context.Context, f *util.Factory, out io.Writer countByRole[instanceGroup.Spec.Role] = countByRole[instanceGroup.Spec.Role] + minSize } if countByRole[kopsapi.InstanceGroupRoleAPIServer]+countByRole[kopsapi.InstanceGroupRoleControlPlane] <= 1 { - fmt.Fprintf(out, "Detected single-control-plane cluster; won't detach before draining\n") options.DeregisterControlPlaneNodes = false } diff --git a/cmd/kops/update_cluster.go b/cmd/kops/update_cluster.go index 845ade886968e..8a3d9cfa20d6e 100644 --- a/cmd/kops/update_cluster.go +++ b/cmd/kops/update_cluster.go @@ -478,7 +478,7 @@ func RunUpdateCluster(ctx context.Context, f *util.Factory, out io.Writer, c *Up fmt.Fprintf(sb, "\n") } - if !firstRun { + if !firstRun && !c.Reconcile { // TODO: Detect if rolling-update is needed fmt.Fprintf(sb, "\n") fmt.Fprintf(sb, "Changes may require instances to restart: kops rolling-update cluster\n") diff --git a/pkg/instancegroups/rollingupdate.go b/pkg/instancegroups/rollingupdate.go index 38b21d96c0bad..bb821adee2321 100644 --- a/pkg/instancegroups/rollingupdate.go +++ b/pkg/instancegroups/rollingupdate.go @@ -20,6 +20,8 @@ import ( "context" stderrors "errors" "fmt" + "maps" + "slices" "sort" "sync" "time" @@ -230,7 +232,8 @@ func (c *RollingUpdateCluster) RollingUpdate(ctx context.Context, groups map[str } } - klog.Infof("Rolling update completed for cluster %q!", c.ClusterName) + igNames := slices.Sorted(maps.Keys(groups)) + klog.Infof("Completed rolling update for cluster %q instance groups %v", c.ClusterName, igNames) return errors.NewAggregate(errs) }