Skip to content

USHIFT-5280: microshift healthcheck - include timeout duration in the logs #4403

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
merged 1 commit into from
Jan 14, 2025
Merged

USHIFT-5280: microshift healthcheck - include timeout duration in the logs #4403

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: 1 addition & 1 deletion pkg/healthcheck/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func microshiftServiceShouldBeOk(ctx context.Context, timeout time.Duration) (bo
}
klog.Info("microshift.service is enabled")

klog.Info("Waiting for microshift.service to be ready")
klog.Infof("Waiting %v for microshift.service to be ready", timeout)
if err := wait.PollUntilContextTimeout(ctx, time.Second, timeout, true, func(ctx context.Context) (done bool, err error) {
return systemd.IsServiceActiveAndNotFailed(ctx, "microshift.service")
}); err != nil {
Expand Down
6 changes: 3 additions & 3 deletions pkg/healthcheck/workloads.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func waitForWorkloads(ctx context.Context, timeout time.Duration, workloads map[
}

func waitForDaemonSet(ctx context.Context, client *appsclientv1.AppsV1Client, timeout time.Duration, namespace, name string) error {
klog.Infof("Waiting for daemonset/%s in %s", name, namespace)
klog.Infof("Waiting %v for daemonset/%s in %s", timeout, name, namespace)
err := wait.PollUntilContextTimeout(ctx, 10*time.Second, timeout, true, func(ctx context.Context) (done bool, err error) {
ds, err := client.DaemonSets(namespace).Get(ctx, name, v1.GetOptions{})
if err != nil {
Expand Down Expand Up @@ -91,7 +91,7 @@ func waitForDaemonSet(ctx context.Context, client *appsclientv1.AppsV1Client, ti
}

func waitForDeployment(ctx context.Context, client *appsclientv1.AppsV1Client, timeout time.Duration, namespace, name string) error {
klog.Infof("Waiting for deployment/%s in %s", name, namespace)
klog.Infof("Waiting %v for deployment/%s in %s", timeout, name, namespace)
err := wait.PollUntilContextTimeout(ctx, 10*time.Second, timeout, true, func(ctx context.Context) (done bool, err error) {
deployment, err := client.Deployments(namespace).Get(ctx, name, v1.GetOptions{})
if err != nil {
Expand Down Expand Up @@ -134,7 +134,7 @@ func waitForDeployment(ctx context.Context, client *appsclientv1.AppsV1Client, t
}

func waitForStatefulSet(ctx context.Context, client *appsclientv1.AppsV1Client, timeout time.Duration, namespace, name string) error {
klog.Infof("Waiting for statefulset/%s in %s", name, namespace)
klog.Infof("Waiting %v for statefulset/%s in %s", timeout, name, namespace)
err := wait.PollUntilContextTimeout(ctx, 10*time.Second, timeout, true, func(ctx context.Context) (done bool, err error) {
sts, err := client.StatefulSets(namespace).Get(ctx, name, v1.GetOptions{})
if err != nil {
Expand Down