@@ -37,14 +37,14 @@ type CustomDefaulter interface {
37
37
}
38
38
39
39
type defaulterOptions struct {
40
- preserveUnknownFields bool
40
+ removeUnknownFields bool
41
41
}
42
42
43
43
type defaulterOption func (* defaulterOptions )
44
44
45
- // DefaulterPreserveUnknownFields stops the defaulter from pruning the fields that are not recognized in the local scheme.
46
- func DefaulterPreserveUnknownFields (o * defaulterOptions ) {
47
- o .preserveUnknownFields = true
45
+ // DefaulterRemoveUnknownFields makes the defaulter prune the fields that are not recognized in the local scheme.
46
+ func DefaulterRemoveUnknownFields (o * defaulterOptions ) {
47
+ o .removeUnknownFields = true
48
48
}
49
49
50
50
// WithCustomDefaulter creates a new Webhook for a CustomDefaulter interface.
@@ -54,15 +54,15 @@ func WithCustomDefaulter(scheme *runtime.Scheme, obj runtime.Object, defaulter C
54
54
o (options )
55
55
}
56
56
return & Webhook {
57
- Handler : & defaulterForType {object : obj , defaulter : defaulter , decoder : NewDecoder (scheme ), preserveUnknownFields : options .preserveUnknownFields },
57
+ Handler : & defaulterForType {object : obj , defaulter : defaulter , decoder : NewDecoder (scheme ), removeUnknownFields : options .removeUnknownFields },
58
58
}
59
59
}
60
60
61
61
type defaulterForType struct {
62
- defaulter CustomDefaulter
63
- object runtime.Object
64
- decoder Decoder
65
- preserveUnknownFields bool
62
+ defaulter CustomDefaulter
63
+ object runtime.Object
64
+ decoder Decoder
65
+ removeUnknownFields bool
66
66
}
67
67
68
68
// Handle handles admission requests.
@@ -97,7 +97,7 @@ func (h *defaulterForType) Handle(ctx context.Context, req Request) Response {
97
97
98
98
// Keep a copy of the object if needed
99
99
var originalObj runtime.Object
100
- if h . preserveUnknownFields {
100
+ if ! h . removeUnknownFields {
101
101
originalObj = obj .DeepCopyObject ()
102
102
}
103
103
@@ -117,7 +117,7 @@ func (h *defaulterForType) Handle(ctx context.Context, req Request) Response {
117
117
}
118
118
119
119
handlerResponse := PatchResponseFromRaw (req .Object .Raw , marshalled )
120
- if h . preserveUnknownFields {
120
+ if ! h . removeUnknownFields {
121
121
handlerResponse = h .dropSchemeRemovals (handlerResponse , originalObj , req .Object .Raw )
122
122
}
123
123
return handlerResponse
0 commit comments