From bba9c3bde1310a2f86922b13a663a9c84afd570e Mon Sep 17 00:00:00 2001 From: Andrew Sy Kim Date: Mon, 19 Sep 2022 13:31:05 -0400 Subject: [PATCH 1/3] remove the feature gate ServiceLoadBalancerClass that GA'd in v1.24 Signed-off-by: Andrew Sy Kim --- pkg/features/kube_features.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index e4c6a252eb1..5a5277e14ba 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -770,15 +770,6 @@ const ( // Allows control if NodePorts shall be created for services with "type: LoadBalancer" by defining the spec.AllocateLoadBalancerNodePorts field (bool) ServiceLBNodePortControl featuregate.Feature = "ServiceLBNodePortControl" - // owner: @andrewsykim @XudongLiuHarold - // kep: http://kep.k8s.io/1959 - // alpha: v1.21 - // beta: v1.22 - // GA: v1.24 - // - // Enable support multiple Service "type: LoadBalancer" implementations in a cluster by specifying LoadBalancerClass - ServiceLoadBalancerClass featuregate.Feature = "ServiceLoadBalancerClass" - // owner: @derekwaynecarr // alpha: v1.20 // beta: v1.22 @@ -1082,8 +1073,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS ServiceLBNodePortControl: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.26 - ServiceLoadBalancerClass: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.26 - SizeMemoryBackedVolumes: {Default: true, PreRelease: featuregate.Beta}, StatefulSetAutoDeletePVC: {Default: false, PreRelease: featuregate.Alpha}, From 7aaacb22a94802c85cd073a5ab0d6b603be49a2c Mon Sep 17 00:00:00 2001 From: Andrew Sy Kim Date: Mon, 19 Sep 2022 13:32:37 -0400 Subject: [PATCH 2/3] remove feature gate ServiceLBNodePortControl that GA'd in v1.24 Signed-off-by: Andrew Sy Kim --- pkg/features/kube_features.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 5a5277e14ba..1d615ed543e 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -761,15 +761,6 @@ const ( // Subdivide the ClusterIP range for dynamic and static IP allocation. ServiceIPStaticSubrange featuregate.Feature = "ServiceIPStaticSubrange" - // owner: @andrewsykim @uablrek - // kep: http://kep.k8s.io/1864 - // alpha: v1.20 - // beta: v1.22 - // ga: v1.24 - // - // Allows control if NodePorts shall be created for services with "type: LoadBalancer" by defining the spec.AllocateLoadBalancerNodePorts field (bool) - ServiceLBNodePortControl featuregate.Feature = "ServiceLBNodePortControl" - // owner: @derekwaynecarr // alpha: v1.20 // beta: v1.22 @@ -1071,8 +1062,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS ServiceInternalTrafficPolicy: {Default: true, PreRelease: featuregate.Beta}, - ServiceLBNodePortControl: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.26 - SizeMemoryBackedVolumes: {Default: true, PreRelease: featuregate.Beta}, StatefulSetAutoDeletePVC: {Default: false, PreRelease: featuregate.Alpha}, From 525a2b183ce5e89fd6976376479adf2254f2f735 Mon Sep 17 00:00:00 2001 From: Andrew Sy Kim Date: Mon, 19 Sep 2022 14:54:27 -0400 Subject: [PATCH 3/3] remove +featureGate=LoadBalancerClass tag in service.spec.loadBalancerClass Signed-off-by: Andrew Sy Kim --- pkg/apis/core/types.go | 1 - staging/src/k8s.io/api/core/v1/generated.proto | 1 - staging/src/k8s.io/api/core/v1/types.go | 1 - 3 files changed, 3 deletions(-) diff --git a/pkg/apis/core/types.go b/pkg/apis/core/types.go index 693f183a081..8d6e7cc1ef6 100644 --- a/pkg/apis/core/types.go +++ b/pkg/apis/core/types.go @@ -3936,7 +3936,6 @@ type ServiceSpec struct { // implementation (e.g. cloud providers) should ignore Services that set this field. // This field can only be set when creating or updating a Service to type 'LoadBalancer'. // Once set, it can not be changed. This field will be wiped when a service is updated to a non 'LoadBalancer' type. - // +featureGate=LoadBalancerClass // +optional LoadBalancerClass *string diff --git a/staging/src/k8s.io/api/core/v1/generated.proto b/staging/src/k8s.io/api/core/v1/generated.proto index 5ca110a3994..5405cc20fac 100644 --- a/staging/src/k8s.io/api/core/v1/generated.proto +++ b/staging/src/k8s.io/api/core/v1/generated.proto @@ -5203,7 +5203,6 @@ message ServiceSpec { // implementation (e.g. cloud providers) should ignore Services that set this field. // This field can only be set when creating or updating a Service to type 'LoadBalancer'. // Once set, it can not be changed. This field will be wiped when a service is updated to a non 'LoadBalancer' type. - // +featureGate=LoadBalancerClass // +optional optional string loadBalancerClass = 21; diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go index 6c98a884dd9..49a37c185eb 100644 --- a/staging/src/k8s.io/api/core/v1/types.go +++ b/staging/src/k8s.io/api/core/v1/types.go @@ -4582,7 +4582,6 @@ type ServiceSpec struct { // implementation (e.g. cloud providers) should ignore Services that set this field. // This field can only be set when creating or updating a Service to type 'LoadBalancer'. // Once set, it can not be changed. This field will be wiped when a service is updated to a non 'LoadBalancer' type. - // +featureGate=LoadBalancerClass // +optional LoadBalancerClass *string `json:"loadBalancerClass,omitempty" protobuf:"bytes,21,opt,name=loadBalancerClass"`