diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 8f7d2035b5c..59e683d5d0e 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -1105,6 +1105,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate DisableNodeKubeProxyVersion: { {Version: version.MustParse("1.29"), Default: false, PreRelease: featuregate.Alpha}, {Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Deprecated}, + {Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.Deprecated}, // lock to default in 1.34 and remove in v1.37 }, DRAAdminAccess: { diff --git a/pkg/kubelet/kubelet_node_status_test.go b/pkg/kubelet/kubelet_node_status_test.go index 64eca034457..312f18bd9b4 100644 --- a/pkg/kubelet/kubelet_node_status_test.go +++ b/pkg/kubelet/kubelet_node_status_test.go @@ -296,7 +296,7 @@ func TestUpdateNewNodeStatus(t *testing.T) { Architecture: goruntime.GOARCH, ContainerRuntimeVersion: "test://1.5.0", KubeletVersion: version.Get().String(), - KubeProxyVersion: version.Get().String(), + KubeProxyVersion: "", }, Capacity: v1.ResourceList{ v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI), @@ -476,7 +476,7 @@ func TestUpdateExistingNodeStatus(t *testing.T) { Architecture: goruntime.GOARCH, ContainerRuntimeVersion: "test://1.5.0", KubeletVersion: version.Get().String(), - KubeProxyVersion: version.Get().String(), + KubeProxyVersion: "", }, Capacity: v1.ResourceList{ v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI), @@ -682,7 +682,7 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) { Architecture: goruntime.GOARCH, ContainerRuntimeVersion: "test://1.5.0", KubeletVersion: version.Get().String(), - KubeProxyVersion: version.Get().String(), + KubeProxyVersion: "", }, Capacity: v1.ResourceList{ v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI), @@ -913,7 +913,7 @@ func TestUpdateNodeStatusWithLease(t *testing.T) { Architecture: goruntime.GOARCH, ContainerRuntimeVersion: "test://1.5.0", KubeletVersion: version.Get().String(), - KubeProxyVersion: version.Get().String(), + KubeProxyVersion: "", }, Capacity: v1.ResourceList{ v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI), diff --git a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml index 380100da3d0..45b016efecb 100644 --- a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml +++ b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml @@ -429,6 +429,10 @@ lockToDefault: false preRelease: Deprecated version: "1.31" + - default: true + lockToDefault: false + preRelease: Deprecated + version: "1.33" - name: DRAAdminAccess versionedSpecs: - default: false