thockin hacking

This commit does not remove deads2k's work, so we can compare approaches.

Assumptions:
* A gate is enabled if it is enabled in EITHER the old mechanism OR the
  new mechanism.
* A gate is disabled if it is disabled in BOTH the old mechanism AND the
  new mechanism.

Author: thockin

cmd/kube-controller-manager/app/storageversionmigrator.go

@@ -26,8 +26,9 @@ import (
 	"k8s.io/controller-manager/controller"
 	"k8s.io/kubernetes/cmd/kube-controller-manager/names"
 	"k8s.io/kubernetes/pkg/features"
+	"k8s.io/utils/feature"
 
-	utilfeature "k8s.io/apiserver/pkg/util/feature"
+	oldutilfeature "k8s.io/apiserver/pkg/util/feature"
 	clientgofeaturegate "k8s.io/client-go/features"
 	svm "k8s.io/kubernetes/pkg/controller/storageversionmigrator"
 )
@@ -45,8 +46,8 @@ func startSVMController(
 	controllerContext ControllerContext,
 	controllerName string,
 ) (controller.Interface, bool, error) {
-	if !utilfeature.DefaultFeatureGate.Enabled(features.StorageVersionMigrator) ||
-		!clientgofeaturegate.InformerResourceVersion2.Enabled() {
+	if !oldutilfeature.DefaultFeatureGate.Enabled(features.StorageVersionMigrator) &&
+		!feature.Enabled(clientgofeaturegate.InformerResourceVersion3) {
 		return nil, false, nil
 	}
 

cmd/kube-controller-manager/controller-manager.go

@@ -21,11 +21,11 @@ limitations under the License.
 package main
 
 import (
-	clientfeatures "k8s.io/client-go/features"
-	"k8s.io/utils/featuregates"
 	"os"
 	_ "time/tzdata" // for CronJob Time Zone support
 
+	clientfeatures "k8s.io/client-go/features"
+
 	"k8s.io/component-base/cli"
 	_ "k8s.io/component-base/logs/json/register"          // for JSON log format registration
 	_ "k8s.io/component-base/metrics/prometheus/clientgo" // load all the prometheus client-go plugin
@@ -34,7 +34,7 @@ import (
 )
 
 func main() {
-	clientfeatures.WatchListClient2.(featuregates.MutableFeatureGate).OverrideDefaultValue(true)
+	clientfeatures.WatchListClient3.Set(true)
 
 	command := app.NewControllerManagerCommand()
 	code := cli.Run(command)

pkg/controlplane/apiserver/options/options.go

@@ -19,12 +19,13 @@ package options
 
 import (
 	"fmt"
-	"k8s.io/kubernetes/pkg/features"
 	"net"
 	"os"
 	"strings"
 	"time"
 
+	"k8s.io/kubernetes/pkg/features"
+
 	peerreconcilers "k8s.io/apiserver/pkg/reconcilers"
 	genericoptions "k8s.io/apiserver/pkg/server/options"
 	"k8s.io/apiserver/pkg/storage/storagebackend"
@@ -99,7 +100,7 @@ type CompletedOptions struct {
 // NewOptions creates a new ServerRunOptions object with default parameters
 func NewOptions() *Options {
 	s := Options{
-		GenericServerRunOptions: genericoptions.NewServerRunOptions(features.KubernetesFeatureSet()),
+		GenericServerRunOptions: genericoptions.NewServerRunOptions(features.KubernetesGates()),
 		Etcd:                    genericoptions.NewEtcdOptions(storagebackend.NewDefaultConfig(kubeoptions.DefaultEtcdPathPrefix, nil)),
 		SecureServing:           kubeoptions.NewSecureServingOptions(),
 		Audit:                   genericoptions.NewAuditOptions(),

pkg/features/kube_features.go

@@ -24,6 +24,7 @@ import (
 	clientfeatures "k8s.io/client-go/features"
 	"k8s.io/component-base/featuregate"
 	kubeaggregatorfeatures "k8s.io/kube-aggregator/pkg/features"
+	"k8s.io/utils/feature"
 	"k8s.io/utils/featuregates"
 )
 
@@ -988,6 +989,10 @@ const (
 
 var (
 	kubernetesFeatureSet = featuregates.NewSimpleFeatureSet()
+	kubeGates            = feature.MergeGateSets(
+		clientfeatures.LibFeatureGates(),
+		//kubeaggregatorfeatures.FeatureGates(),
+		apiextensionsfeatures.FeatureGates())
 )
 
 func init() {
@@ -1002,6 +1007,9 @@ func init() {
 func KubernetesFeatureSet() featuregates.FeatureSet {
 	return kubernetesFeatureSet
 }
+func KubernetesGates() *feature.GateSet {
+	return kubeGates
+}
 
 func init() {
 	runtime.Must(utilfeature.DefaultMutableFeatureGate.Add(defaultKubernetesFeatureGates))

staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/options/options.go

@@ -61,7 +61,7 @@ type CustomResourceDefinitionsServerOptions struct {
 // NewCustomResourceDefinitionsServerOptions creates default options of an apiextensions-apiserver.
 func NewCustomResourceDefinitionsServerOptions(out, errOut io.Writer) *CustomResourceDefinitionsServerOptions {
 	o := &CustomResourceDefinitionsServerOptions{
-		ServerRunOptions: genericoptions.NewServerRunOptions(features.LibraryFeatureSet()),
+		ServerRunOptions: genericoptions.NewServerRunOptions(features.FeatureGates()),
 		RecommendedOptions: genericoptions.NewRecommendedOptions(
 			defaultEtcdPathPrefix,
 			apiserver.Codecs.LegacyCodec(v1beta1.SchemeGroupVersion, v1.SchemeGroupVersion),

staging/src/k8s.io/apiextensions-apiserver/pkg/features/kube_features.go

@@ -20,6 +20,7 @@ import (
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	clientfeatures "k8s.io/client-go/features"
 	"k8s.io/component-base/featuregate"
+	"k8s.io/utils/feature"
 	"k8s.io/utils/featuregates"
 )
 
@@ -60,6 +61,18 @@ var (
 					ToFeatureGateOrDie()
 
 	libraryFeatureSet = featuregates.NewSimpleFeatureSet()
+
+	libGates                 = &feature.GateSet{}
+	CRDValidationRatcheting3 = libGates.Add(&feature.Gate{
+		Name:    "CRDValidationRatcheting",
+		Default: true,
+		Release: feature.Beta,
+	})
+	CustomResourceFieldSelectors3 = libGates.Add(&feature.Gate{
+		Name:    "CustomResourceFieldSelectors",
+		Default: false,
+		Release: feature.Beta,
+	})
 )
 
 func init() {
@@ -77,6 +90,10 @@ func LibraryFeatureSet() featuregates.FeatureSet {
 	return libraryFeatureSet
 }
 
+func FeatureGates() *feature.GateSet {
+	return libGates
+}
+
 // defaultKubernetesFeatureGates consists of all known Kubernetes-specific feature keys.
 // To add a new feature, define a key for it above and add it here. The features will be
 // available throughout Kubernetes binaries.

staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go

@@ -18,12 +18,13 @@ package options
 
 import (
 	"fmt"
-	"k8s.io/utils/featuregates"
 	"net"
 	"regexp"
 	"strings"
 	"time"
 
+	"k8s.io/utils/feature"
+
 	"github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apimachinery/pkg/util/errors"
@@ -89,10 +90,10 @@ type ServerRunOptions struct {
 	// it is not overridden by any other grace period.
 	ShutdownWatchTerminationGracePeriod time.Duration
 
-	FeatureSetOptions *featuregates.FeatureSetOptions
+	FeatureGates *feature.GateSet
 }
 
-func NewServerRunOptions(featureSet featuregates.FeatureSet) *ServerRunOptions {
+func NewServerRunOptions(featureGates *feature.GateSet) *ServerRunOptions {
 	defaults := server.NewConfig(serializer.CodecFactory{})
 	return &ServerRunOptions{
 		MaxRequestsInFlight:                 defaults.MaxRequestsInFlight,
@@ -105,7 +106,7 @@ func NewServerRunOptions(featureSet featuregates.FeatureSet) *ServerRunOptions {
 		JSONPatchMaxCopyBytes:               defaults.JSONPatchMaxCopyBytes,
 		MaxRequestBodyBytes:                 defaults.MaxRequestBodyBytes,
 		ShutdownSendRetryAfter:              false,
-		FeatureSetOptions:                   featuregates.NewFeatureSetOptions(featureSet),
+		FeatureGates:                        featureGates,
 	}
 }
 
@@ -339,5 +340,5 @@ func (s *ServerRunOptions) AddUniversalFlags(fs *pflag.FlagSet) {
 		"This option, if set, represents the maximum amount of grace period the apiserver will wait "+
 		"for active watch request(s) to drain during the graceful server shutdown window.")
 
-	s.FeatureSetOptions.AddFlags(fs)
+	s.FeatureGates.AddFlags("new-feature-gates", fs)
 }

staging/src/k8s.io/client-go/features/known_features.go

@@ -16,7 +16,10 @@ limitations under the License.
 
 package features
 
-import "k8s.io/utils/featuregates"
+import (
+	"k8s.io/utils/feature"
+	"k8s.io/utils/featuregates"
+)
 
 const (
 	// Every feature gate should add method here following this template:
@@ -55,6 +58,16 @@ var (
 					ToFeatureGateOrDie()
 
 	libraryFeatureSet = featuregates.NewSimpleFeatureSet()
+
+	libGates         = &feature.GateSet{}
+	WatchListClient3 = libGates.Add(&feature.Gate{
+		Name:    "WatchListClient",
+		Release: feature.Beta,
+	})
+	InformerResourceVersion3 = libGates.Add(&feature.Gate{
+		Name:    "InformerResourceVersion",
+		Release: feature.Alpha,
+	})
 )
 
 func init() {
@@ -68,6 +81,11 @@ func LibraryFeatureSet() featuregates.FeatureSet {
 	return libraryFeatureSet
 }
 
+// FIXME: rename to FeatureGates when other definition is gone.
+func LibFeatureGates() *feature.GateSet {
+	return libGates
+}
+
 // defaultKubernetesFeatureGates consists of all known Kubernetes-specific feature keys.
 //
 // To add a new feature, define a key for it above and add it here.

staging/src/k8s.io/client-go/tools/cache/shared_informer.go

@@ -29,6 +29,7 @@ import (
 	"k8s.io/client-go/tools/cache/synctrack"
 	"k8s.io/utils/buffer"
 	"k8s.io/utils/clock"
+	"k8s.io/utils/feature"
 
 	"k8s.io/klog/v2"
 
@@ -411,7 +412,8 @@ func (v *dummyController) HasSynced() bool {
 }
 
 func (v *dummyController) LastSyncResourceVersion() string {
-	if clientgofeaturegate.InformerResourceVersion2.Enabled() {
+	if clientgofeaturegate.FeatureGates().Enabled(clientgofeaturegate.InformerResourceVersion) ||
+		feature.Enabled(clientgofeaturegate.InformerResourceVersion3) {
 		return v.informer.LastSyncResourceVersion()
 	}