Skip to content

Commit 98c29f0

Browse files
HirazawaUiHirazawaUi
committed
promote DisableNodeKubeProxyVersion feature gate to beta
1 parent 8f80e01 commit 98c29f0

File tree

9 files changed

+19
-16
lines changed

9 files changed

+19
-16
lines changed

‎api/openapi-spec/swagger.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/openapi-spec/v3/api__v1_openapi.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4053,7 +4053,7 @@
40534053
},
40544054
"kubeProxyVersion": {
40554055
"default": "",
4056-
"description": "KubeProxy Version reported by the node.",
4056+
"description": "Deprecated: KubeProxy Version reported by the node.",
40574057
"type": "string"
40584058
},
40594059
"kubeletVersion": {

‎pkg/features/kube_features.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ const (
228228
// owner: @HirazawaUi
229229
// kep: http://kep.k8s.io/4004
230230
// alpha: v1.29
231+
// beta: v1.31
231232
// DisableNodeKubeProxyVersion disable the status.nodeInfo.kubeProxyVersion field of v1.Node
232233
DisableNodeKubeProxyVersion featuregate.Feature = "DisableNodeKubeProxyVersion"
233234

@@ -1054,7 +1055,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
10541055

10551056
DisableKubeletCloudCredentialProviders: {Default: true, PreRelease: featuregate.Beta},
10561057

1057-
DisableNodeKubeProxyVersion: {Default: false, PreRelease: featuregate.Alpha},
1058+
DisableNodeKubeProxyVersion: {Default: true, PreRelease: featuregate.Beta},
10581059

10591060
DevicePluginCDIDevices: {Default: true, PreRelease: featuregate.Beta},
10601061

‎pkg/generated/openapi/zz_generated.openapi.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/kubelet/kubelet_node_status_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ func TestUpdateNewNodeStatus(t *testing.T) {
268268
Architecture: goruntime.GOARCH,
269269
ContainerRuntimeVersion: "test://1.5.0",
270270
KubeletVersion: version.Get().String(),
271-
KubeProxyVersion: version.Get().String(),
271+
KubeProxyVersion: "",
272272
},
273273
Capacity: v1.ResourceList{
274274
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),
@@ -447,7 +447,7 @@ func TestUpdateExistingNodeStatus(t *testing.T) {
447447
Architecture: goruntime.GOARCH,
448448
ContainerRuntimeVersion: "test://1.5.0",
449449
KubeletVersion: version.Get().String(),
450-
KubeProxyVersion: version.Get().String(),
450+
KubeProxyVersion: "",
451451
},
452452
Capacity: v1.ResourceList{
453453
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),
@@ -652,7 +652,7 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) {
652652
Architecture: goruntime.GOARCH,
653653
ContainerRuntimeVersion: "test://1.5.0",
654654
KubeletVersion: version.Get().String(),
655-
KubeProxyVersion: version.Get().String(),
655+
KubeProxyVersion: "",
656656
},
657657
Capacity: v1.ResourceList{
658658
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),
@@ -882,7 +882,7 @@ func TestUpdateNodeStatusWithLease(t *testing.T) {
882882
Architecture: goruntime.GOARCH,
883883
ContainerRuntimeVersion: "test://1.5.0",
884884
KubeletVersion: version.Get().String(),
885-
KubeProxyVersion: version.Get().String(),
885+
KubeProxyVersion: "",
886886
},
887887
Capacity: v1.ResourceList{
888888
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),

‎staging/src/k8s.io/api/core/v1/generated.proto

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/api/core/v1/types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5809,7 +5809,7 @@ type NodeSystemInfo struct {
58095809
ContainerRuntimeVersion string `json:"containerRuntimeVersion" protobuf:"bytes,6,opt,name=containerRuntimeVersion"`
58105810
// Kubelet Version reported by the node.
58115811
KubeletVersion string `json:"kubeletVersion" protobuf:"bytes,7,opt,name=kubeletVersion"`
5812-
// KubeProxy Version reported by the node.
5812+
// Deprecated: KubeProxy Version reported by the node.
58135813
KubeProxyVersion string `json:"kubeProxyVersion" protobuf:"bytes,8,opt,name=kubeProxyVersion"`
58145814
// The Operating System reported by the node
58155815
OperatingSystem string `json:"operatingSystem" protobuf:"bytes,9,opt,name=operatingSystem"`

‎staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/e2e/cloud/gcp/common/upgrade_mechanics.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -252,16 +252,18 @@ func checkNodesVersions(ctx context.Context, cs clientset.Interface, want string
252252
}
253253
for _, n := range l.Items {
254254
// We do prefix trimming and then matching because:
255-
// want looks like: 0.19.3-815-g50e67d4
256-
// kv/kvp look like: v0.19.3-815-g50e67d4034e858-dirty
255+
// want looks like: 0.19.3-815-g50e67d4
256+
// kv look like: v0.19.3-815-g50e67d4034e858-dirty
257+
// kpv look like: v0.19.3-815-g50e67d4034e858-dirty or empty value
257258
kv, kpv := strings.TrimPrefix(n.Status.NodeInfo.KubeletVersion, "v"),
258-
strings.TrimPrefix(n.Status.NodeInfo.KubeProxyVersion, "v")
259+
strings.TrimPrefix(n.Status.NodeInfo.KubeProxyVersion, "v") //nolint:staticcheck // Keep testing deprecated KubeProxyVersion field until it's being removed
259260
if !strings.HasPrefix(kv, want) {
260261
return fmt.Errorf("node %s had kubelet version %s which does not start with %s",
261262
n.ObjectMeta.Name, kv, want)
262263
}
263-
if !strings.HasPrefix(kpv, want) {
264-
return fmt.Errorf("node %s had kube-proxy version %s which does not start with %s",
264+
265+
if len(kpv) != 0 || !strings.HasPrefix(kpv, want) {
266+
return fmt.Errorf("node %s had kube-proxy version %s which does not start with %s or is not empty value",
265267
n.ObjectMeta.Name, kpv, want)
266268
}
267269
}

0 commit comments

Comments
 (0)