Skip to content

Commit 13ee2bc

Browse files
authored
Merge pull request #443 from mengqiy/conversionstatus
🐛 set status in conversion response
2 parents e72b0e7 + 0af7a98 commit 13ee2bc

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

pkg/webhook/conversion/conversion.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,11 @@ func (wh *Webhook) ServeHTTP(w http.ResponseWriter, r *http.Request) {
7575
if err != nil {
7676
log.Error(err, "failed to convert", "request", convertReview.Request.UID)
7777
convertReview.Response = errored(err)
78-
convertReview.Response.UID = convertReview.Request.UID
7978
} else {
8079
convertReview.Response = resp
8180
}
81+
convertReview.Response.UID = convertReview.Request.UID
82+
convertReview.Request = nil
8283

8384
err = json.NewEncoder(w).Encode(convertReview)
8485
if err != nil {
@@ -112,6 +113,9 @@ func (wh *Webhook) handleConvertRequest(req *apix.ConversionRequest) (*apix.Conv
112113
return &apix.ConversionResponse{
113114
UID: req.UID,
114115
ConvertedObjects: objects,
116+
Result: metav1.Status{
117+
Status: metav1.StatusSuccess,
118+
},
115119
}, nil
116120
}
117121

pkg/webhook/conversion/conversion_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ var _ = Describe("Conversion Webhook", func() {
122122
convReview := doRequest(convReq)
123123

124124
Expect(convReview.Response.ConvertedObjects).To(HaveLen(1))
125+
Expect(convReview.Response.Result.Status).To(Equal(metav1.StatusSuccess))
125126
got, _, err := decoder.Decode(convReview.Response.ConvertedObjects[0].Raw)
126127
Expect(err).NotTo(HaveOccurred())
127128
Expect(got).To(Equal(expected))

0 commit comments

Comments
 (0)