Skip to content

Commit 1af6bc9

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #123845 from HirazawaUi/promote-DisableNodeKubeProxyVersion-to-beta
promote DisableNodeKubeProxyVersion feature gate to beta
2 parents b36ddbb + 98c29f0 commit 1af6bc9

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
@@ -4062,7 +4062,7 @@
40624062
},
40634063
"kubeProxyVersion": {
40644064
"default": "",
4065-
"description": "KubeProxy Version reported by the node.",
4065+
"description": "Deprecated: KubeProxy Version reported by the node.",
40664066
"type": "string"
40674067
},
40684068
"kubeletVersion": {

‎pkg/features/kube_features.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ const (
207207
// owner: @HirazawaUi
208208
// kep: http://kep.k8s.io/4004
209209
// alpha: v1.29
210+
// beta: v1.31
210211
// DisableNodeKubeProxyVersion disable the status.nodeInfo.kubeProxyVersion field of v1.Node
211212
DisableNodeKubeProxyVersion featuregate.Feature = "DisableNodeKubeProxyVersion"
212213

@@ -1028,7 +1029,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
10281029

10291030
DisableKubeletCloudCredentialProviders: {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
10301031

1031-
DisableNodeKubeProxyVersion: {Default: false, PreRelease: featuregate.Alpha},
1032+
DisableNodeKubeProxyVersion: {Default: true, PreRelease: featuregate.Beta},
10321033

10331034
DevicePluginCDIDevices: {Default: true, PreRelease: featuregate.Beta},
10341035

‎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
@@ -291,7 +291,7 @@ func TestUpdateNewNodeStatus(t *testing.T) {
291291
Architecture: goruntime.GOARCH,
292292
ContainerRuntimeVersion: "test://1.5.0",
293293
KubeletVersion: version.Get().String(),
294-
KubeProxyVersion: version.Get().String(),
294+
KubeProxyVersion: "",
295295
},
296296
Capacity: v1.ResourceList{
297297
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),
@@ -471,7 +471,7 @@ func TestUpdateExistingNodeStatus(t *testing.T) {
471471
Architecture: goruntime.GOARCH,
472472
ContainerRuntimeVersion: "test://1.5.0",
473473
KubeletVersion: version.Get().String(),
474-
KubeProxyVersion: version.Get().String(),
474+
KubeProxyVersion: "",
475475
},
476476
Capacity: v1.ResourceList{
477477
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),
@@ -677,7 +677,7 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) {
677677
Architecture: goruntime.GOARCH,
678678
ContainerRuntimeVersion: "test://1.5.0",
679679
KubeletVersion: version.Get().String(),
680-
KubeProxyVersion: version.Get().String(),
680+
KubeProxyVersion: "",
681681
},
682682
Capacity: v1.ResourceList{
683683
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),
@@ -908,7 +908,7 @@ func TestUpdateNodeStatusWithLease(t *testing.T) {
908908
Architecture: goruntime.GOARCH,
909909
ContainerRuntimeVersion: "test://1.5.0",
910910
KubeletVersion: version.Get().String(),
911-
KubeProxyVersion: version.Get().String(),
911+
KubeProxyVersion: "",
912912
},
913913
Capacity: v1.ResourceList{
914914
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
@@ -5814,7 +5814,7 @@ type NodeSystemInfo struct {
58145814
ContainerRuntimeVersion string `json:"containerRuntimeVersion" protobuf:"bytes,6,opt,name=containerRuntimeVersion"`
58155815
// Kubelet Version reported by the node.
58165816
KubeletVersion string `json:"kubeletVersion" protobuf:"bytes,7,opt,name=kubeletVersion"`
5817-
// KubeProxy Version reported by the node.
5817+
// Deprecated: KubeProxy Version reported by the node.
58185818
KubeProxyVersion string `json:"kubeProxyVersion" protobuf:"bytes,8,opt,name=kubeProxyVersion"`
58195819
// The Operating System reported by the node
58205820
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)