|
4 | 4 | "context"
|
5 | 5 | "fmt"
|
6 | 6 |
|
7 |
| - "golang.org/x/xerrors" |
8 | 7 | "k8s.io/apimachinery/pkg/runtime/schema"
|
9 | 8 |
|
10 | 9 | "cdr.dev/coder-doctor/internal/api"
|
@@ -46,14 +45,23 @@ func (k *KubernetesChecker) CheckResources(_ context.Context) []*api.CheckResult
|
46 | 45 | }
|
47 | 46 |
|
48 | 47 | for versionReq := range k.reqs.ResourceRequirements {
|
49 |
| - if !resourcesAvailable[*versionReq] { |
50 |
| - msg := fmt.Sprintf("missing required resource:%q group:%q version:%q", versionReq.Resource, versionReq.Group, versionReq.Version) |
51 |
| - errResult := api.ErrorResult(checkName, msg, xerrors.New(msg)) |
52 |
| - results = append(results, errResult) |
53 |
| - continue |
| 48 | + result := &api.CheckResult{ |
| 49 | + Summary: checkName, |
| 50 | + Details: map[string]interface{}{ |
| 51 | + "resource": versionReq.Resource, |
| 52 | + "group": versionReq.Group, |
| 53 | + "groupVersion": versionReq.Version, |
| 54 | + }, |
| 55 | + } |
| 56 | + |
| 57 | + if resourcesAvailable[*versionReq] { |
| 58 | + result.Summary = fmt.Sprintf("Cluster supports %s resource %s", versionReq.Version, versionReq.Resource) |
| 59 | + result.State = api.StatePassed |
| 60 | + } else { |
| 61 | + result.Summary = fmt.Sprintf("Cluster does not support %s resource %s", versionReq.Version, versionReq.Resource) |
| 62 | + result.State = api.StateFailed |
54 | 63 | }
|
55 |
| - msg := fmt.Sprintf("found required resource:%q group:%q version:%q", versionReq.Resource, versionReq.Group, versionReq.Version) |
56 |
| - results = append(results, api.PassResult(checkName, msg)) |
| 64 | + results = append(results, result) |
57 | 65 | }
|
58 | 66 |
|
59 | 67 | return results
|
|
0 commit comments