Skip to content

Commit b5297b1

Browse files
committed
Remove AllowServiceLBStatusOnNonLB feature gate
1 parent 8cd57a9 commit b5297b1

File tree

4 files changed

+3
-48
lines changed

4 files changed

+3
-48
lines changed

pkg/apis/core/validation/validation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8389,7 +8389,7 @@ var (
83898389
func ValidateLoadBalancerStatus(status, oldStatus *core.LoadBalancerStatus, fldPath *field.Path, spec *core.ServiceSpec) field.ErrorList {
83908390
allErrs := field.ErrorList{}
83918391
ingrPath := fldPath.Child("ingress")
8392-
if !utilfeature.DefaultFeatureGate.Enabled(features.AllowServiceLBStatusOnNonLB) && spec.Type != core.ServiceTypeLoadBalancer && len(status.Ingress) != 0 {
8392+
if spec.Type != core.ServiceTypeLoadBalancer && len(status.Ingress) != 0 {
83938393
allErrs = append(allErrs, field.Forbidden(ingrPath, "may only be used when `spec.type` is 'LoadBalancer'"))
83948394
} else {
83958395
var existingIngressIPs []string

pkg/apis/core/validation/validation_test.go

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26914,15 +26914,13 @@ func TestValidateLoadBalancerStatus(t *testing.T) {
2691426914
name string
2691526915
ipModeEnabled bool
2691626916
legacyIPs bool
26917-
nonLBAllowed bool
2691826917
tweakOldLBStatus func(s *core.LoadBalancerStatus)
2691926918
tweakLBStatus func(s *core.LoadBalancerStatus)
2692026919
tweakSvcSpec func(s *core.ServiceSpec)
2692126920
numErrs int
2692226921
}{
2692326922
{
26924-
name: "type is not LB",
26925-
nonLBAllowed: false,
26923+
name: "type is not LB",
2692626924
tweakSvcSpec: func(s *core.ServiceSpec) {
2692726925
s.Type = core.ServiceTypeClusterIP
2692826926
},
@@ -26932,18 +26930,6 @@ func TestValidateLoadBalancerStatus(t *testing.T) {
2693226930
}}
2693326931
},
2693426932
numErrs: 1,
26935-
}, {
26936-
name: "type is not LB. back-compat",
26937-
nonLBAllowed: true,
26938-
tweakSvcSpec: func(s *core.ServiceSpec) {
26939-
s.Type = core.ServiceTypeClusterIP
26940-
},
26941-
tweakLBStatus: func(s *core.LoadBalancerStatus) {
26942-
s.Ingress = []core.LoadBalancerIngress{{
26943-
IP: "1.2.3.4",
26944-
}}
26945-
},
26946-
numErrs: 0,
2694726933
}, {
2694826934
name: "valid vip ipMode",
2694926935
ipModeEnabled: true,
@@ -27081,10 +27067,7 @@ func TestValidateLoadBalancerStatus(t *testing.T) {
2708127067
// when testing !ipModeEnabled.)
2708227068
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.StrictIPCIDRValidation, !tc.legacyIPs)
2708327069
}
27084-
featuregatetesting.SetFeatureGatesDuringTest(t, utilfeature.DefaultFeatureGate, featuregatetesting.FeatureOverrides{
27085-
features.LoadBalancerIPMode: tc.ipModeEnabled,
27086-
features.AllowServiceLBStatusOnNonLB: tc.nonLBAllowed,
27087-
})
27070+
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.LoadBalancerIPMode, tc.ipModeEnabled)
2708827071
oldStatus := core.LoadBalancerStatus{}
2708927072
if tc.tweakOldLBStatus != nil {
2709027073
tc.tweakOldLBStatus(&oldStatus)

pkg/features/kube_features.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,6 @@ const (
5656
// Allow spec.terminationGracePeriodSeconds to be overridden by MaxPodGracePeriodSeconds in soft evictions.
5757
AllowOverwriteTerminationGracePeriodSeconds featuregate.Feature = "AllowOverwriteTerminationGracePeriodSeconds"
5858

59-
// owner: @thockin
60-
//
61-
// Enables Service.status.ingress.loadBanace to be set on
62-
// services of types other than LoadBalancer.
63-
AllowServiceLBStatusOnNonLB featuregate.Feature = "AllowServiceLBStatusOnNonLB"
64-
6559
// owner: @bswartz
6660
//
6761
// Enables usage of any object for volume data source in PVCs
@@ -1067,12 +1061,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
10671061
{Version: version.MustParse("1.35"), Default: false, PreRelease: featuregate.Deprecated, LockToDefault: true}, // remove in 1.38
10681062
},
10691063

1070-
AllowServiceLBStatusOnNonLB: {
1071-
{Version: version.MustParse("1.0"), Default: true, PreRelease: featuregate.GA},
1072-
{Version: version.MustParse("1.29"), Default: false, PreRelease: featuregate.Deprecated},
1073-
{Version: version.MustParse("1.32"), Default: false, PreRelease: featuregate.Deprecated, LockToDefault: true}, // remove in 1.35
1074-
},
1075-
10761064
AnyVolumeDataSource: {
10771065
{Version: version.MustParse("1.18"), Default: false, PreRelease: featuregate.Alpha},
10781066
{Version: version.MustParse("1.24"), Default: true, PreRelease: featuregate.Beta},
@@ -2023,8 +2011,6 @@ var defaultKubernetesFeatureGateDependencies = map[featuregate.Feature][]feature
20232011

20242012
AllowOverwriteTerminationGracePeriodSeconds: {},
20252013

2026-
AllowServiceLBStatusOnNonLB: {},
2027-
20282014
AnyVolumeDataSource: {},
20292015

20302016
AuthorizeNodeWithSelectors: {genericfeatures.AuthorizeWithSelectors},

test/compatibility_lifecycle/reference/versioned_feature_list.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,6 @@
5151
lockToDefault: false
5252
preRelease: Beta
5353
version: "1.33"
54-
- name: AllowServiceLBStatusOnNonLB
55-
versionedSpecs:
56-
- default: true
57-
lockToDefault: false
58-
preRelease: GA
59-
version: "1.0"
60-
- default: false
61-
lockToDefault: false
62-
preRelease: Deprecated
63-
version: "1.29"
64-
- default: false
65-
lockToDefault: true
66-
preRelease: Deprecated
67-
version: "1.32"
6854
- name: AllowUnsafeMalformedObjectDeletion
6955
versionedSpecs:
7056
- default: false

0 commit comments

Comments
 (0)