Skip to content

OTA-1154: pkg/cli/admin/upgrade/status: Drop free-form Progressing output line #1753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Apr 30, 2024
Merged

OTA-1154: pkg/cli/admin/upgrade/status: Drop free-form Progressing output line #1753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions pkg/cli/admin/upgrade/status/examples/4.14.1-degraded.detailed-output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
An update is in progress for 1h58m50s: Unable to apply 4.14.1: wait has exceeded 40 minutes for these operators: etcd, kube-apiserver

= Control Plane =
Assessment: Progressing
Completion: 97%
Expand Down
2 changes: 0 additions & 2 deletions pkg/cli/admin/upgrade/status/examples/4.14.1-degraded.output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
An update is in progress for 1h58m50s: Unable to apply 4.14.1: wait has exceeded 40 minutes for these operators: etcd, kube-apiserver

= Control Plane =
Assessment: Progressing
Completion: 97%
Expand Down
2 changes: 0 additions & 2 deletions pkg/cli/admin/upgrade/status/examples/4.14.1-paused-worker-pool.detailed-output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
An update is in progress for 6s: Working towards 4.14.1: 139 of 859 done (16% complete), waiting on kube-scheduler

= Control Plane =
Assessment: Progressing
Completion: 12%
Expand Down
2 changes: 0 additions & 2 deletions pkg/cli/admin/upgrade/status/examples/4.14.1-paused-worker-pool.output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
An update is in progress for 6s: Working towards 4.14.1: 139 of 859 done (16% complete), waiting on kube-scheduler

= Control Plane =
Assessment: Progressing
Completion: 12%
Expand Down
2 changes: 0 additions & 2 deletions ...in/upgrade/status/examples/4.14.1-workers-started-updating-multiple-pools.detailed-output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
An update is in progress for 14m4s: Working towards 4.14.1: 734 of 859 done (85% complete), waiting on machine-config

= Control Plane =
Assessment: Progressing
Completion: 97%
Expand Down
2 changes: 0 additions & 2 deletions pkg/cli/admin/upgrade/status/examples/4.14.1-workers-started-updating-multiple-pools.output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
An update is in progress for 14m4s: Working towards 4.14.1: 734 of 859 done (85% complete), waiting on machine-config

= Control Plane =
Assessment: Progressing
Completion: 97%
Expand Down
2 changes: 0 additions & 2 deletions pkg/cli/admin/upgrade/status/examples/4.15.0-ec2-b02-cos-not-annotated.detailed-output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
An update is in progress for 52m56s: Working towards 4.15.0-ec.2: 357 of 1021 done (34% complete), waiting up to 40 minutes on cluster-api

= Control Plane =
Assessment: Progressing
Completion: 43%
Expand Down
2 changes: 0 additions & 2 deletions pkg/cli/admin/upgrade/status/examples/4.15.0-ec2-b02-cos-not-annotated.output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
An update is in progress for 52m56s: Working towards 4.15.0-ec.2: 357 of 1021 done (34% complete), waiting up to 40 minutes on cluster-api

= Control Plane =
Assessment: Progressing
Completion: 43%
Expand Down
2 changes: 0 additions & 2 deletions pkg/cli/admin/upgrade/status/examples/4.15.0-ec2-early.detailed-output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
An update is in progress for 1m29s: Working towards 4.15.0-ec.2: 106 of 863 done (12% complete), waiting on etcd, kube-apiserver

= Control Plane =
Assessment: Progressing
Completion: 3%
Expand Down
2 changes: 0 additions & 2 deletions pkg/cli/admin/upgrade/status/examples/4.15.0-ec2-early.output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
An update is in progress for 1m29s: Working towards 4.15.0-ec.2: 106 of 863 done (12% complete), waiting on etcd, kube-apiserver

= Control Plane =
Assessment: Progressing
Completion: 3%
Expand Down
2 changes: 0 additions & 2 deletions pkg/cli/admin/upgrade/status/examples/4.15.0-ec2-unavailable-mco-20m.detailed-output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
An update is in progress for 58m53s: Working towards 4.15.0-ec.2: 110 of 863 done (12% complete), waiting up to 40 minutes on etcd

= Control Plane =
Assessment: Progressing
Completion: 97%
Expand Down
2 changes: 0 additions & 2 deletions pkg/cli/admin/upgrade/status/examples/4.15.0-ec2-unavailable-mco-20m.output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
An update is in progress for 58m53s: Working towards 4.15.0-ec.2: 110 of 863 done (12% complete), waiting up to 40 minutes on etcd

= Control Plane =
Assessment: Progressing
Completion: 97%
Expand Down
2 changes: 0 additions & 2 deletions ...e/status/examples/4.16.0-ec2-control-plane-updated-pdb-prohibits-draining.detailed-output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
An update is in progress for 4h3m46s: Error while reconciling 4.16.0-ec.3: the cluster operator machine-config is degraded

= Control Plane =
Assessment: Completed
Completion: 100%
Expand Down
2 changes: 0 additions & 2 deletions ...in/upgrade/status/examples/4.16.0-ec2-control-plane-updated-pdb-prohibits-draining.output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
An update is in progress for 4h3m46s: Error while reconciling 4.16.0-ec.3: the cluster operator machine-config is degraded

= Control Plane =
Assessment: Completed
Completion: 100%
Expand Down
2 changes: 0 additions & 2 deletions pkg/cli/admin/upgrade/status/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,9 @@ func (o *options) Run(ctx context.Context) error {
startedAt = cv.Status.History[0].StartedTime.Time
}
updatingFor := now.Sub(startedAt).Round(time.Second)
fmt.Fprintf(o.Out, "An update is in progress for %s: %s\n", updatingFor, progressing.Message)

controlPlaneStatusData, insights := assessControlPlaneStatus(cv, operators.Items, now)
updateInsights = append(updateInsights, insights...)
fmt.Fprintf(o.Out, "\n")
_ = controlPlaneStatusData.Write(o.Out)
controlPlanePoolStatusData.WriteNodes(o.Out, o.enabledDetailed(detailedOutputNodes))

Expand Down