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]>

Author: gman0

pkg/features/kcp_features.go

@@ -89,9 +89,8 @@ var defaultGenericControlPlaneFeatureGates = map[featuregate.Feature]featuregate
 	WorkspaceMounts: {Default: false, PreRelease: featuregate.Alpha},
 	// inherited features from generic apiserver, relisted here to get a conflict if it is changed
 	// unintentionally on either side:
-	genericfeatures.APIResponseCompression:    {Default: true, PreRelease: featuregate.Beta},
-	genericfeatures.OpenAPIEnums:              {Default: true, PreRelease: featuregate.Beta},
-	genericfeatures.ServerSideFieldValidation: {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
+	genericfeatures.APIResponseCompression: {Default: true, PreRelease: featuregate.Beta},
+	genericfeatures.OpenAPIEnums:           {Default: true, PreRelease: featuregate.Beta},
 
 	logsapi.LoggingBetaOptions: {Default: true, PreRelease: featuregate.Beta},
 	logsapi.ContextualLogging:  {Default: true, PreRelease: featuregate.Alpha},

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

@@ -32,12 +32,10 @@ import (
 	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 	"k8s.io/apiserver/pkg/endpoints/metrics"
 	apirequest "k8s.io/apiserver/pkg/endpoints/request"
-	"k8s.io/apiserver/pkg/features"
 	"k8s.io/apiserver/pkg/registry/rest"
 	kubernetesscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/kube-openapi/pkg/validation/spec"
 
-	kcpfeatures "github.com/kcp-dev/kcp/pkg/features"
 	"github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apidefinition"
 	dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context"
 	apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
@@ -178,6 +176,7 @@ func (r *resourceHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	supportedTypes := []string{
 		string(types.JSONPatchType),
 		string(types.MergePatchType),
+		string(types.ApplyPatchType),
 	}
 
 	// 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) {
 		}
 	}
 
-	if kcpfeatures.DefaultFeatureGate.Enabled(features.ServerSideApply) {
-		supportedTypes = append(supportedTypes, string(types.ApplyPatchType))
-	}
-
 	var handlerFunc http.HandlerFunc
 	subresources := apiResourceVersion.Subresources
 	switch {

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

@@ -40,14 +40,12 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apiserver/pkg/endpoints/handlers"
 	"k8s.io/apiserver/pkg/endpoints/openapi"
-	"k8s.io/apiserver/pkg/features"
 	"k8s.io/apiserver/pkg/registry/rest"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	utilopenapi "k8s.io/apiserver/pkg/util/openapi"
 	"k8s.io/klog/v2"
 	"k8s.io/kube-openapi/pkg/validation/spec"
 
-	kcpfeatures "github.com/kcp-dev/kcp/pkg/features"
 	"github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apidefinition"
 	apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
 )
@@ -245,23 +243,21 @@ func CreateServingInfoFor(genericConfig genericapiserver.CompletedConfig, apiRes
 		OpenapiModels:            modelsByGKV,
 	}
 
-	if kcpfeatures.DefaultFeatureGate.Enabled(features.ServerSideApply) {
-		if withResetFields, canGetResetFields := storage.(rest.ResetFieldsStrategy); canGetResetFields {
-			resetFields := withResetFields.GetResetFields()
-			reqScope := *requestScope
-			reqScope, err = apiextensionsapiserver.ScopeWithFieldManager(
-				typeConverter,
-				reqScope,
-				resetFields,
-				"",
-			)
-			if err != nil {
-				return nil, err
-			}
-			requestScope = &reqScope
-		} else {
-			return nil, fmt.Errorf("storage for resource %q should define GetResetFields", gvk.String())
+	if withResetFields, canGetResetFields := storage.(rest.ResetFieldsStrategy); canGetResetFields {
+		resetFields := withResetFields.GetResetFields()
+		reqScope := *requestScope
+		reqScope, err = apiextensionsapiserver.ScopeWithFieldManager(
+			typeConverter,
+			reqScope,
+			resetFields,
+			"",
+		)
+		if err != nil {
+			return nil, err
 		}
+		requestScope = &reqScope
+	} else {
+		return nil, fmt.Errorf("storage for resource %q should define GetResetFields", gvk.String())
 	}
 
 	var statusScope handlers.RequestScope
@@ -275,21 +271,19 @@ func CreateServingInfoFor(genericConfig genericapiserver.CompletedConfig, apiRes
 			ClusterScoped: clusterScoped,
 		}
 
-		if kcpfeatures.DefaultFeatureGate.Enabled(features.ServerSideApply) {
-			if withResetFields, canGetResetFields := statusStorage.(rest.ResetFieldsStrategy); canGetResetFields {
-				resetFields := withResetFields.GetResetFields()
-				statusScope, err = apiextensionsapiserver.ScopeWithFieldManager(
-					typeConverter,
-					statusScope,
-					resetFields,
-					"status",
-				)
-				if err != nil {
-					return nil, err
-				}
-			} else {
-				return nil, fmt.Errorf("storage for resource %q status should define GetResetFields", gvk.String())
+		if withResetFields, canGetResetFields := statusStorage.(rest.ResetFieldsStrategy); canGetResetFields {
+			resetFields := withResetFields.GetResetFields()
+			statusScope, err = apiextensionsapiserver.ScopeWithFieldManager(
+				typeConverter,
+				statusScope,
+				resetFields,
+				"status",
+			)
+			if err != nil {
+				return nil, err
 			}
+		} else {
+			return nil, fmt.Errorf("storage for resource %q status should define GetResetFields", gvk.String())
 		}
 	}