From d8da86b16d14dafa3f98ecfd190d3d1d30cb1e15 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Thu, 15 Aug 2024 11:08:23 -0400 Subject: [PATCH] Switch DisableNodeKubeProxyVersion back to disabled-by-default This is clearing a stable API field, so the 1 year from announcement to change period applies --- pkg/features/kube_features.go | 5 ++--- pkg/kubelet/kubelet_node_status_test.go | 9 +++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 80a25132bca..519d448dd57 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -235,8 +235,7 @@ const ( // owner: @HirazawaUi // kep: http://kep.k8s.io/4004 - // alpha: v1.29 - // beta: v1.31 + // Deprecated: v1.29 (default off) // DisableNodeKubeProxyVersion disable the status.nodeInfo.kubeProxyVersion field of v1.Node DisableNodeKubeProxyVersion featuregate.Feature = "DisableNodeKubeProxyVersion" @@ -1057,7 +1056,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS DisableKubeletCloudCredentialProviders: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, - DisableNodeKubeProxyVersion: {Default: true, PreRelease: featuregate.Beta}, + DisableNodeKubeProxyVersion: {Default: false, PreRelease: featuregate.Deprecated}, // default on in 1.33 DevicePluginCDIDevices: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.33 diff --git a/pkg/kubelet/kubelet_node_status_test.go b/pkg/kubelet/kubelet_node_status_test.go index cedd70db35a..2cee198ecf7 100644 --- a/pkg/kubelet/kubelet_node_status_test.go +++ b/pkg/kubelet/kubelet_node_status_test.go @@ -34,6 +34,7 @@ import ( cadvisorapi "github.com/google/cadvisor/info/v1" "github.com/google/go-cmp/cmp" + v1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -291,7 +292,7 @@ func TestUpdateNewNodeStatus(t *testing.T) { Architecture: goruntime.GOARCH, ContainerRuntimeVersion: "test://1.5.0", KubeletVersion: version.Get().String(), - KubeProxyVersion: "", + KubeProxyVersion: version.Get().String(), }, Capacity: v1.ResourceList{ v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI), @@ -471,7 +472,7 @@ func TestUpdateExistingNodeStatus(t *testing.T) { Architecture: goruntime.GOARCH, ContainerRuntimeVersion: "test://1.5.0", KubeletVersion: version.Get().String(), - KubeProxyVersion: "", + KubeProxyVersion: version.Get().String(), }, Capacity: v1.ResourceList{ v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI), @@ -677,7 +678,7 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) { Architecture: goruntime.GOARCH, ContainerRuntimeVersion: "test://1.5.0", KubeletVersion: version.Get().String(), - KubeProxyVersion: "", + KubeProxyVersion: version.Get().String(), }, Capacity: v1.ResourceList{ v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI), @@ -908,7 +909,7 @@ func TestUpdateNodeStatusWithLease(t *testing.T) { Architecture: goruntime.GOARCH, ContainerRuntimeVersion: "test://1.5.0", KubeletVersion: version.Get().String(), - KubeProxyVersion: "", + KubeProxyVersion: version.Get().String(), }, Capacity: v1.ResourceList{ v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),