Skip to content

Commit 119df9d

Browse files
committed
features: removed GA'ed ServerSideFieldValidation and ServerSideApply feature gate
See kubernetes/kubernetes#127058 On-behalf-of: SAP [email protected] Signed-off-by: Robert Vasek <[email protected]>
1 parent 5b3ee08 commit 119df9d

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

pkg/features/kcp_features.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,8 @@ var defaultGenericControlPlaneFeatureGates = map[featuregate.Feature]featuregate
8989
WorkspaceMounts: {Default: false, PreRelease: featuregate.Alpha},
9090
// inherited features from generic apiserver, relisted here to get a conflict if it is changed
9191
// unintentionally on either side:
92-
genericfeatures.APIResponseCompression: {Default: true, PreRelease: featuregate.Beta},
93-
genericfeatures.OpenAPIEnums: {Default: true, PreRelease: featuregate.Beta},
94-
genericfeatures.ServerSideFieldValidation: {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
92+
genericfeatures.APIResponseCompression: {Default: true, PreRelease: featuregate.Beta},
93+
genericfeatures.OpenAPIEnums: {Default: true, PreRelease: featuregate.Beta},
9594

9695
logsapi.LoggingBetaOptions: {Default: true, PreRelease: featuregate.Beta},
9796
logsapi.ContextualLogging: {Default: true, PreRelease: featuregate.Alpha},

pkg/virtual/framework/dynamic/apiserver/handler.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,10 @@ import (
3232
"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
3333
"k8s.io/apiserver/pkg/endpoints/metrics"
3434
apirequest "k8s.io/apiserver/pkg/endpoints/request"
35-
"k8s.io/apiserver/pkg/features"
3635
"k8s.io/apiserver/pkg/registry/rest"
3736
kubernetesscheme "k8s.io/client-go/kubernetes/scheme"
3837
"k8s.io/kube-openapi/pkg/validation/spec"
3938

40-
kcpfeatures "github.com/kcp-dev/kcp/pkg/features"
4139
"github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apidefinition"
4240
dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context"
4341
apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
@@ -178,6 +176,7 @@ func (r *resourceHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
178176
supportedTypes := []string{
179177
string(types.JSONPatchType),
180178
string(types.MergePatchType),
179+
string(types.ApplyPatchType),
181180
}
182181

183182
// 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) {
202201
}
203202
}
204203

205-
if kcpfeatures.DefaultFeatureGate.Enabled(features.ServerSideApply) {
206-
supportedTypes = append(supportedTypes, string(types.ApplyPatchType))
207-
}
208-
209204
var handlerFunc http.HandlerFunc
210205
subresources := apiResourceVersion.Subresources
211206
switch {

0 commit comments

Comments
 (0)