Skip to content

Commit 39d6396

Browse files
committed
Promote the DisableNodeKubeProxyVersion feature gate to be enabled by default.
1 parent 67bdb11 commit 39d6396

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

pkg/features/kube_features.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,6 +1104,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
11041104
DisableNodeKubeProxyVersion: {
11051105
{Version: version.MustParse("1.29"), Default: false, PreRelease: featuregate.Alpha},
11061106
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Deprecated},
1107+
{Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.Deprecated}, // lock to default in 1.34 and remove in v1.37
11071108
},
11081109

11091110
DRAAdminAccess: {

pkg/kubelet/kubelet_node_status_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ func TestUpdateNewNodeStatus(t *testing.T) {
296296
Architecture: goruntime.GOARCH,
297297
ContainerRuntimeVersion: "test://1.5.0",
298298
KubeletVersion: version.Get().String(),
299-
KubeProxyVersion: version.Get().String(),
299+
KubeProxyVersion: "",
300300
},
301301
Capacity: v1.ResourceList{
302302
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),
@@ -476,7 +476,7 @@ func TestUpdateExistingNodeStatus(t *testing.T) {
476476
Architecture: goruntime.GOARCH,
477477
ContainerRuntimeVersion: "test://1.5.0",
478478
KubeletVersion: version.Get().String(),
479-
KubeProxyVersion: version.Get().String(),
479+
KubeProxyVersion: "",
480480
},
481481
Capacity: v1.ResourceList{
482482
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),
@@ -682,7 +682,7 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) {
682682
Architecture: goruntime.GOARCH,
683683
ContainerRuntimeVersion: "test://1.5.0",
684684
KubeletVersion: version.Get().String(),
685-
KubeProxyVersion: version.Get().String(),
685+
KubeProxyVersion: "",
686686
},
687687
Capacity: v1.ResourceList{
688688
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),
@@ -913,7 +913,7 @@ func TestUpdateNodeStatusWithLease(t *testing.T) {
913913
Architecture: goruntime.GOARCH,
914914
ContainerRuntimeVersion: "test://1.5.0",
915915
KubeletVersion: version.Get().String(),
916-
KubeProxyVersion: version.Get().String(),
916+
KubeProxyVersion: "",
917917
},
918918
Capacity: v1.ResourceList{
919919
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),

test/compatibility_lifecycle/reference/versioned_feature_list.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,10 @@
429429
lockToDefault: false
430430
preRelease: Deprecated
431431
version: "1.31"
432+
- default: true
433+
lockToDefault: false
434+
preRelease: Deprecated
435+
version: "1.33"
432436
- name: DRAAdminAccess
433437
versionedSpecs:
434438
- default: false

0 commit comments

Comments
 (0)