Skip to content

Commit ab4e8c9

Browse files
committed
Review Remarks
1 parent e652815 commit ab4e8c9

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

pkg/webhook/admission/defaulter_custom.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,10 @@ func (h *defaulterForType) dropSchemeRemovals(r Response, original runtime.Objec
140140
return Errored(http.StatusInternalServerError, err)
141141
}
142142

143-
patchOriginal := PatchResponseFromRaw(raw, marshalledOriginal).Patches
143+
patchOriginal, err := jsonpatch.CreatePatch(raw, marshalledOriginal)
144+
if err != nil {
145+
return Errored(http.StatusInternalServerError, err)
146+
}
144147
removedByScheme := sets.New(slices.DeleteFunc(patchOriginal, func(p jsonpatch.JsonPatchOperation) bool { return p.Operation != opRemove })...)
145148

146149
r.Patches = slices.DeleteFunc(r.Patches, func(p jsonpatch.JsonPatchOperation) bool {

pkg/webhook/admission/defaulter_custom_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929

3030
var _ = Describe("Defaulter Handler", func() {
3131

32-
It("should not preserve unknown fields by default", func() {
32+
It("should remove unknown fields when DefaulterRemoveUnknownFields is passed", func() {
3333
obj := &TestDefaulter{}
3434
handler := WithCustomDefaulter(admissionScheme, obj, &TestCustomDefaulter{}, DefaulterRemoveUnknownFields)
3535

@@ -61,7 +61,7 @@ var _ = Describe("Defaulter Handler", func() {
6161
Expect(resp.Result.Code).Should(Equal(int32(http.StatusOK)))
6262
})
6363

64-
It("should preserve unknown fields when DefaulterPreserveUnknownFields is passed", func() {
64+
It("should preserve unknown fields by default", func() {
6565
obj := &TestDefaulter{}
6666
handler := WithCustomDefaulter(admissionScheme, obj, &TestCustomDefaulter{})
6767

0 commit comments

Comments
 (0)