features: reduce risk of merge conflicts

Merge conflicts become less likely when:
- features are sorted alphabetically because
  then changes are more likely to be done in
  different parts of the files
- blank lines separate the hash entries because
  gofmt then doesn't change the formating of
  other entries when adding or removing one

Merge conflicts where pretty common shortly before a code freeze when everyone
added new features at the end of the files.

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

@@ -28,7 +28,48 @@ const (
 	//
 	// // owner: @username
 	// // alpha: v1.4
-	// MyFeature() bool
+	// MyFeature featuregate.Feature = "MyFeature"
+	//
+	// Feature gates should be listed in alphabetical, case-sensitive
+	// (upper before any lower case character) order. This reduces the risk
+	// of code conflicts because changes are more likely to be scattered
+	// across the file.
+
+	// owner: @smarterclayton
+	// alpha: v1.8
+	// beta: v1.9
+	//
+	// Allow API clients to retrieve resource lists in chunks rather than
+	// all at once.
+	APIListChunking featuregate.Feature = "APIListChunking"
+
+	// owner: @MikeSpreitzer @yue9944882
+	// alpha: v1.18
+	// beta: v1.20
+	//
+	// Enables managing request concurrency with prioritization and fairness at each server.
+	// The FeatureGate was introduced in release 1.15 but the feature
+	// was not really implemented before 1.18.
+	APIPriorityAndFairness featuregate.Feature = "APIPriorityAndFairness"
+
+	// owner: @ilackams
+	// alpha: v1.7
+	// beta: v1.16
+	//
+	// Enables compression of REST responses (GET and LIST only)
+	APIResponseCompression featuregate.Feature = "APIResponseCompression"
+
+	// owner: @roycaihw
+	// alpha: v1.20
+	//
+	// Assigns each kube-apiserver an ID in a cluster.
+	APIServerIdentity featuregate.Feature = "APIServerIdentity"
+
+	// owner: @dashpole
+	// alpha: v1.22
+	//
+	// Add support for distributed tracing in the API Server
+	APIServerTracing featuregate.Feature = "APIServerTracing"
 
 	// owner: @tallclair
 	// alpha: v1.7
@@ -40,20 +81,12 @@ const (
 	// audited.
 	AdvancedAuditing featuregate.Feature = "AdvancedAuditing"
 
-	// owner: @ilackams
+	// owner: @cici37
-	// alpha: v1.7
+	// kep: http://kep.k8s.io/2876
-	// beta: v1.16
+	// alpha: v1.23
 	//
-	// Enables compression of REST responses (GET and LIST only)
+	// Enables expression validation for Custom Resource
-	APIResponseCompression featuregate.Feature = "APIResponseCompression"
+	CustomResourceValidationExpressions featuregate.Feature = "CustomResourceValidationExpressions"
-
-	// owner: @smarterclayton
-	// alpha: v1.8
-	// beta: v1.9
-	//
-	// Allow API clients to retrieve resource lists in chunks rather than
-	// all at once.
-	APIListChunking featuregate.Feature = "APIListChunking"
 
 	// owner: @apelisse
 	// alpha: v1.12
@@ -65,6 +98,31 @@ const (
 	// committing.
 	DryRun featuregate.Feature = "DryRun"
 
+	// owner: @wojtek-t
+	// alpha: v1.20
+	// beta: v1.21
+	// GA: v1.24
+	//
+	// Allows for updating watchcache resource version with progress notify events.
+	EfficientWatchResumption featuregate.Feature = "EfficientWatchResumption"
+
+	// owner: @jiahuif
+	// kep: http://kep.k8s.io/2887
+	// alpha: v1.23
+	// beta: v1.24
+	//
+	// Enables populating "enum" field of OpenAPI schemas
+	// in the spec returned from kube-apiserver.
+	OpenAPIEnums featuregate.Feature = "OpenAPIEnums"
+
+	// owner: @jefftree
+	// kep: http://kep.k8s.io/2896
+	// alpha: v1.23
+	// beta: v1.24
+	//
+	// Enables kubernetes to publish OpenAPI v3
+	OpenAPIV3 featuregate.Feature = "OpenAPIV3"
+
 	// owner: @caesarxuchao
 	// alpha: v1.15
 	// beta: v1.16
@@ -73,45 +131,6 @@ const (
 	// to a chunking list request.
 	RemainingItemCount featuregate.Feature = "RemainingItemCount"
 
-	// owner: @apelisse, @lavalamp
-	// alpha: v1.14
-	// beta: v1.16
-	// stable: v1.22
-	//
-	// Server-side apply. Merging happens on the server.
-	ServerSideApply featuregate.Feature = "ServerSideApply"
-
-	// owner: @caesarxuchao
-	// alpha: v1.14
-	// beta: v1.15
-	//
-	// Allow apiservers to expose the storage version hash in the discovery
-	// document.
-	StorageVersionHash featuregate.Feature = "StorageVersionHash"
-
-	// owner: @caesarxuchao @roycaihw
-	// alpha: v1.20
-	//
-	// Enable the storage version API.
-	StorageVersionAPI featuregate.Feature = "StorageVersionAPI"
-
-	// owner: @wojtek-t
-	// alpha: v1.15
-	// beta: v1.16
-	// GA: v1.17
-	//
-	// Enables support for watch bookmark events.
-	WatchBookmark featuregate.Feature = "WatchBookmark"
-
-	// owner: @MikeSpreitzer @yue9944882
-	// alpha: v1.18
-	// beta: v1.20
-	//
-	// Enables managing request concurrency with prioritization and fairness at each server.
-	// The FeatureGate was introduced in release 1.15 but the feature
-	// was not really implemented before 1.18.
-	APIPriorityAndFairness featuregate.Feature = "APIPriorityAndFairness"
-
 	// owner: @wojtek-t
 	// alpha: v1.16
 	// beta: v1.20
@@ -128,49 +147,13 @@ const (
 	// Allows label and field based indexes in apiserver watch cache to accelerate list operations.
 	SelectorIndex featuregate.Feature = "SelectorIndex"
 
-	// owner: @wojtek-t
+	// owner: @apelisse, @lavalamp
-	// alpha: v1.20
+	// alpha: v1.14
-	// beta: v1.21
+	// beta: v1.16
-	// GA: v1.24
+	// stable: v1.22
 	//
-	// Allows for updating watchcache resource version with progress notify events.
+	// Server-side apply. Merging happens on the server.
-	EfficientWatchResumption featuregate.Feature = "EfficientWatchResumption"
+	ServerSideApply featuregate.Feature = "ServerSideApply"
-
-	// owner: @roycaihw
-	// alpha: v1.20
-	//
-	// Assigns each kube-apiserver an ID in a cluster.
-	APIServerIdentity featuregate.Feature = "APIServerIdentity"
-
-	// owner: @dashpole
-	// alpha: v1.22
-	//
-	// Add support for distributed tracing in the API Server
-	APIServerTracing featuregate.Feature = "APIServerTracing"
-
-	// owner: @jiahuif
-	// kep: http://kep.k8s.io/2887
-	// alpha: v1.23
-	// beta: v1.24
-	//
-	// Enables populating "enum" field of OpenAPI schemas
-	// in the spec returned from kube-apiserver.
-	OpenAPIEnums featuregate.Feature = "OpenAPIEnums"
-
-	// owner: @cici37
-	// kep: http://kep.k8s.io/2876
-	// alpha: v1.23
-	//
-	// Enables expression validation for Custom Resource
-	CustomResourceValidationExpressions featuregate.Feature = "CustomResourceValidationExpressions"
-
-	// owner: @jefftree
-	// kep: http://kep.k8s.io/2896
-	// alpha: v1.23
-	// beta: v1.24
-	//
-	// Enables kubernetes to publish OpenAPI v3
-	OpenAPIV3 featuregate.Feature = "OpenAPIV3"
 
 	// owner: @kevindelgado
 	// kep: http://kep.k8s.io/2885
@@ -178,6 +161,28 @@ const (
 	//
 	// Enables server-side field validation.
 	ServerSideFieldValidation featuregate.Feature = "ServerSideFieldValidation"
+
+	// owner: @caesarxuchao @roycaihw
+	// alpha: v1.20
+	//
+	// Enable the storage version API.
+	StorageVersionAPI featuregate.Feature = "StorageVersionAPI"
+
+	// owner: @caesarxuchao
+	// alpha: v1.14
+	// beta: v1.15
+	//
+	// Allow apiservers to expose the storage version hash in the discovery
+	// document.
+	StorageVersionHash featuregate.Feature = "StorageVersionHash"
+
+	// owner: @wojtek-t
+	// alpha: v1.15
+	// beta: v1.16
+	// GA: v1.17
+	//
+	// Enables support for watch bookmark events.
+	WatchBookmark featuregate.Feature = "WatchBookmark"
 )
 
 func init() {
@@ -188,23 +193,41 @@ func init() {
 // To add a new feature, define a key for it above and add it here. The features will be
 // available throughout Kubernetes binaries.
 var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
-	AdvancedAuditing:                    {Default: true, PreRelease: featuregate.GA},
+	APIListChunking: {Default: true, PreRelease: featuregate.Beta},
-	APIResponseCompression:              {Default: true, PreRelease: featuregate.Beta},
+
-	APIListChunking:                     {Default: true, PreRelease: featuregate.Beta},
+	APIPriorityAndFairness: {Default: true, PreRelease: featuregate.Beta},
-	DryRun:                              {Default: true, PreRelease: featuregate.GA},
+
-	RemainingItemCount:                  {Default: true, PreRelease: featuregate.Beta},
+	APIResponseCompression: {Default: true, PreRelease: featuregate.Beta},
-	ServerSideApply:                     {Default: true, PreRelease: featuregate.GA},
+
-	StorageVersionHash:                  {Default: true, PreRelease: featuregate.Beta},
+	APIServerIdentity: {Default: false, PreRelease: featuregate.Alpha},
-	StorageVersionAPI:                   {Default: false, PreRelease: featuregate.Alpha},
+
-	WatchBookmark:                       {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
+	APIServerTracing: {Default: false, PreRelease: featuregate.Alpha},
-	APIPriorityAndFairness:              {Default: true, PreRelease: featuregate.Beta},
+
-	RemoveSelfLink:                      {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
+	AdvancedAuditing: {Default: true, PreRelease: featuregate.GA},
-	SelectorIndex:                       {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
+
-	EfficientWatchResumption:            {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
-	APIServerIdentity:                   {Default: false, PreRelease: featuregate.Alpha},
-	APIServerTracing:                    {Default: false, PreRelease: featuregate.Alpha},
-	OpenAPIEnums:                        {Default: true, PreRelease: featuregate.Beta},
 	CustomResourceValidationExpressions: {Default: false, PreRelease: featuregate.Alpha},
-	OpenAPIV3:                           {Default: true, PreRelease: featuregate.Beta},
+
-	ServerSideFieldValidation:           {Default: false, PreRelease: featuregate.Alpha},
+	DryRun: {Default: true, PreRelease: featuregate.GA},
+
+	EfficientWatchResumption: {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
+
+	OpenAPIEnums: {Default: true, PreRelease: featuregate.Beta},
+
+	OpenAPIV3: {Default: true, PreRelease: featuregate.Beta},
+
+	RemainingItemCount: {Default: true, PreRelease: featuregate.Beta},
+
+	RemoveSelfLink: {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
+
+	SelectorIndex: {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
+
+	ServerSideApply: {Default: true, PreRelease: featuregate.GA},
+
+	ServerSideFieldValidation: {Default: false, PreRelease: featuregate.Alpha},
+
+	StorageVersionAPI: {Default: false, PreRelease: featuregate.Alpha},
+
+	StorageVersionHash: {Default: true, PreRelease: featuregate.Beta},
+
+	WatchBookmark: {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
 }

staging/src/k8s.io/controller-manager/pkg/features/kube_features.go

@@ -25,14 +25,12 @@ const (
 	//
 	// // owner: @username
 	// // alpha: v1.4
-	// MyFeature() bool
+	// MyFeature featuregate.Feature = "MyFeature"
-
-	// owner: @khenidak
-	// alpha: v1.15
 	//
-	// Enables ipv6 dual stack
+	// Feature gates should be listed in alphabetical, case-sensitive
-	// Original copy from k8s.io/kubernetes/pkg/features/kube_features.go
+	// (upper before any lower case character) order. This reduces the risk
-	IPv6DualStack featuregate.Feature = "IPv6DualStack"
+	// of code conflicts because changes are more likely to be scattered
+	// across the file.
 
 	// owner: @jiahuif
 	// alpha: v1.21
@@ -42,6 +40,13 @@ const (
 	// Enables Leader Migration for kube-controller-manager and cloud-controller-manager
 	// copied and sync'ed from k8s.io/kubernetes/pkg/features/kube_features.go
 	ControllerManagerLeaderMigration featuregate.Feature = "ControllerManagerLeaderMigration"
+
+	// owner: @khenidak
+	// alpha: v1.15
+	//
+	// Enables ipv6 dual stack
+	// Original copy from k8s.io/kubernetes/pkg/features/kube_features.go
+	IPv6DualStack featuregate.Feature = "IPv6DualStack"
 )
 
 func SetupCurrentKubernetesSpecificFeatureGates(featuregates featuregate.MutableFeatureGate) error {
@@ -51,6 +56,7 @@ func SetupCurrentKubernetesSpecificFeatureGates(featuregates featuregate.Mutable
 // cloudPublicFeatureGates consists of cloud-specific feature keys.
 // To add a new feature, define a key for it at k8s.io/api/pkg/features and add it here.
 var cloudPublicFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
-	IPv6DualStack:                    {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
 	ControllerManagerLeaderMigration: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.26
+
+	IPv6DualStack: {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
 }