@@ -32,12 +32,10 @@ import (
32
32
"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
33
33
"k8s.io/apiserver/pkg/endpoints/metrics"
34
34
apirequest "k8s.io/apiserver/pkg/endpoints/request"
35
- "k8s.io/apiserver/pkg/features"
36
35
"k8s.io/apiserver/pkg/registry/rest"
37
36
kubernetesscheme "k8s.io/client-go/kubernetes/scheme"
38
37
"k8s.io/kube-openapi/pkg/validation/spec"
39
38
40
- kcpfeatures "github.com/kcp-dev/kcp/pkg/features"
41
39
"github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apidefinition"
42
40
dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context"
43
41
apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
@@ -178,6 +176,7 @@ func (r *resourceHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
178
176
supportedTypes := []string {
179
177
string (types .JSONPatchType ),
180
178
string (types .MergePatchType ),
179
+ string (types .ApplyPatchType ),
181
180
}
182
181
183
182
// HACK: Support resources of the client-go scheme the way existing clients expect it:
@@ -202,10 +201,6 @@ func (r *resourceHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
202
201
}
203
202
}
204
203
205
- if kcpfeatures .DefaultFeatureGate .Enabled (features .ServerSideApply ) {
206
- supportedTypes = append (supportedTypes , string (types .ApplyPatchType ))
207
- }
208
-
209
204
var handlerFunc http.HandlerFunc
210
205
subresources := apiResourceVersion .Subresources
211
206
switch {
0 commit comments