Skip to content

Commit 55b89ae

Browse files
committed
fix: Use preflight check name as cause type
Previously, the "FailedPreflight" prefix was present, but it makes it more difficult to identify the name of the check that failed, and the prefix is not necessary, because the top-level Message explains that preflight checks failed.
1 parent e8184c6 commit 55b89ae

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

pkg/webhook/preflight/preflight.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,13 @@ func (h *WebhookHandler) Handle(ctx context.Context, req admission.Request) admi
131131
resp.Allowed = false
132132
}
133133
for _, cause := range result.Causes {
134-
resp.Result.Details.Causes = append(resp.Result.Details.Causes, metav1.StatusCause{
135-
Type: metav1.CauseType(fmt.Sprintf("FailedPreflight%s", result.Name)),
136-
Message: cause.Message,
137-
Field: cause.Field,
138-
})
134+
resp.Result.Details.Causes = append(resp.Result.Details.Causes,
135+
metav1.StatusCause{
136+
Type: metav1.CauseType(result.Name),
137+
Message: cause.Message,
138+
Field: cause.Field,
139+
},
140+
)
139141
}
140142
resp.Warnings = append(resp.Warnings, result.Warnings...)
141143
}

pkg/webhook/preflight/preflight_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ func TestHandle(t *testing.T) {
248248
Details: &metav1.StatusDetails{
249249
Causes: []metav1.StatusCause{
250250
{
251-
Type: "FailedPreflightTest1",
251+
Type: "Test1",
252252
Field: "spec.test",
253253
Message: "test failed",
254254
},
@@ -342,11 +342,11 @@ func TestHandle(t *testing.T) {
342342
Details: &metav1.StatusDetails{
343343
Causes: []metav1.StatusCause{
344344
{
345-
Type: "FailedPreflightTest2",
345+
Type: "Test2",
346346
Message: "check failed",
347347
},
348348
{
349-
Type: "FailedPreflightTest1",
349+
Type: "Test1",
350350
Message: "internal error",
351351
},
352352
},
@@ -475,11 +475,11 @@ func TestHandleCancelledContext(t *testing.T) {
475475
Details: &metav1.StatusDetails{
476476
Causes: []metav1.StatusCause{
477477
{
478-
Type: "FailedPreflightTest1",
478+
Type: "Test1",
479479
Message: "context cancelled",
480480
},
481481
{
482-
Type: "FailedPreflightTest2",
482+
Type: "Test2",
483483
Message: "context cancelled",
484484
},
485485
},

0 commit comments

Comments
 (0)