Skip to content

Commit

Permalink
Fix hint URLs not display for RPC checks (#2361)
Browse files Browse the repository at this point in the history
Hint URLs should display for all failed checks in `linkerd check`, but
were not displaying for RPC checks.

Fix `runCheckRPC` to pass along the hintAnchor to the check result.

Also rename the second `can query the control plane API` to
`control plane self-check`, as there were two checks with that name.

Signed-off-by: Andrew Seigner <siggy@buoyant.io>
  • Loading branch information
siggy authored Feb 23, 2019
1 parent b9b8eb4 commit 7fa7e96
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion pkg/healthcheck/healthcheck.go
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ func (hc *HealthChecker) allCategories() []category {
},
},
{
description: "can query the control plane API",
description: "control plane self-check",
hintAnchor: "l5d-api-control-api",
fatal: true,
retryDeadline: hc.RetryDeadline,
Expand Down Expand Up @@ -699,6 +699,7 @@ func (hc *HealthChecker) runCheckRPC(categoryID CategoryID, c *checker, observer
observer(&CheckResult{
Category: categoryID,
Description: c.description,
HintAnchor: c.hintAnchor,
Warning: c.warning,
Err: err,
})
Expand Down
2 changes: 1 addition & 1 deletion test/testdata/check.golden
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ linkerd-existence
linkerd-api
-----------
√ control plane pods are ready
can query the control plane API
√ control plane self-check
√ [kubernetes] control plane can talk to Kubernetes
√ [prometheus] control plane can talk to Prometheus

Expand Down
2 changes: 1 addition & 1 deletion test/testdata/check.proxy.golden
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ linkerd-existence
linkerd-api
-----------
√ control plane pods are ready
can query the control plane API
√ control plane self-check
√ [kubernetes] control plane can talk to Kubernetes
√ [prometheus] control plane can talk to Prometheus

Expand Down
2 changes: 1 addition & 1 deletion test/testdata/check.proxy.single_namespace.golden
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ linkerd-existence
linkerd-api
-----------
√ control plane pods are ready
can query the control plane API
√ control plane self-check
√ [kubernetes] control plane can talk to Kubernetes
√ [prometheus] control plane can talk to Prometheus

Expand Down
2 changes: 1 addition & 1 deletion test/testdata/check.single_namespace.golden
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ linkerd-existence
linkerd-api
-----------
√ control plane pods are ready
can query the control plane API
√ control plane self-check
√ [kubernetes] control plane can talk to Kubernetes
√ [prometheus] control plane can talk to Prometheus

Expand Down

0 comments on commit 7fa7e96

Please sign in to comment.