Skip to content

Commit 30e3187

Browse files
AkihiroSudak8s-publishing-bot
authored andcommitted
api: NodeStatus: rename RuntimeClasses to RuntimeHandlers
The runtime classes are apiserver's concept, while the handlers are kubelet's concept. For NodeStatus, it makes more sense to return the latter ones here. This commit modifies the following files: - pkg/apis/core/types.go - staging/src/k8s.io/api/core/v1/types.go - pkg/kubelet/nodestatus/setters.go - pkg/kubelet/kubelet_node_status.go - pkg/registry/core/node/strategy.go - test/e2e_node/mount_rro_linux_test.go Other changes were auto-generated by running `make update`. Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> Kubernetes-commit: 1dc05009fe7f4e1d139b0c8394683edb54f8d082
1 parent 96558b9 commit 30e3187

7 files changed

+1085
-1085
lines changed

core/v1/generated.pb.go

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

core/v1/generated.proto

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

core/v1/types.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -5769,24 +5769,24 @@ type NodeDaemonEndpoints struct {
57695769
KubeletEndpoint DaemonEndpoint `json:"kubeletEndpoint,omitempty" protobuf:"bytes,1,opt,name=kubeletEndpoint"`
57705770
}
57715771

5772-
// NodeRuntimeClassFeatures is a set of runtime features.
5773-
type NodeRuntimeClassFeatures struct {
5774-
// RecursiveReadOnlyMounts is set to true if the runtime class supports RecursiveReadOnlyMounts.
5772+
// NodeRuntimeHandlerFeatures is a set of runtime features.
5773+
type NodeRuntimeHandlerFeatures struct {
5774+
// RecursiveReadOnlyMounts is set to true if the runtime handler supports RecursiveReadOnlyMounts.
57755775
// +featureGate=RecursiveReadOnlyMounts
57765776
// +optional
57775777
RecursiveReadOnlyMounts *bool `json:"recursiveReadOnlyMounts,omitempty" protobuf:"varint,1,opt,name=recursiveReadOnlyMounts"`
57785778
// Reserved: UserNamespaces *bool (varint 2, for consistency with CRI API)
57795779
}
57805780

5781-
// NodeRuntimeClass is a set of runtime class information.
5782-
type NodeRuntimeClass struct {
5783-
// Runtime class name.
5784-
// Empty for the default runtime class.
5781+
// NodeRuntimeHandler is a set of runtime handler information.
5782+
type NodeRuntimeHandler struct {
5783+
// Runtime handler name.
5784+
// Empty for the default runtime handler.
57855785
// +optional
57865786
Name string `json:"name" protobuf:"bytes,1,opt,name=name"`
57875787
// Supported features.
57885788
// +optional
5789-
Features *NodeRuntimeClassFeatures `json:"features,omitempty" protobuf:"bytes,2,opt,name=features"`
5789+
Features *NodeRuntimeHandlerFeatures `json:"features,omitempty" protobuf:"bytes,2,opt,name=features"`
57905790
}
57915791

57925792
// NodeSystemInfo is a set of ids/uuids to uniquely identify the node.
@@ -5925,11 +5925,11 @@ type NodeStatus struct {
59255925
// Status of the config assigned to the node via the dynamic Kubelet config feature.
59265926
// +optional
59275927
Config *NodeConfigStatus `json:"config,omitempty" protobuf:"bytes,11,opt,name=config"`
5928-
// The available runtime classes.
5928+
// The available runtime handlers.
59295929
// +featureGate=RecursiveReadOnlyMounts
59305930
// +optional
59315931
// +listType=atomic
5932-
RuntimeClasses []NodeRuntimeClass `json:"runtimeClasses,omitempty" protobuf:"bytes,12,rep,name=runtimeClasses"`
5932+
RuntimeHandlers []NodeRuntimeHandler `json:"runtimeHandlers,omitempty" protobuf:"bytes,12,rep,name=runtimeHandlers"`
59335933
}
59345934

59355935
type UniqueVolumeName string

core/v1/types_swagger_doc_generated.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -1214,23 +1214,23 @@ func (NodeProxyOptions) SwaggerDoc() map[string]string {
12141214
return map_NodeProxyOptions
12151215
}
12161216

1217-
var map_NodeRuntimeClass = map[string]string{
1218-
"": "NodeRuntimeClass is a set of runtime class information.",
1219-
"name": "Runtime class name. Empty for the default runtime class.",
1217+
var map_NodeRuntimeHandler = map[string]string{
1218+
"": "NodeRuntimeHandler is a set of runtime handler information.",
1219+
"name": "Runtime handler name. Empty for the default runtime handler.",
12201220
"features": "Supported features.",
12211221
}
12221222

1223-
func (NodeRuntimeClass) SwaggerDoc() map[string]string {
1224-
return map_NodeRuntimeClass
1223+
func (NodeRuntimeHandler) SwaggerDoc() map[string]string {
1224+
return map_NodeRuntimeHandler
12251225
}
12261226

1227-
var map_NodeRuntimeClassFeatures = map[string]string{
1228-
"": "NodeRuntimeClassFeatures is a set of runtime features.",
1229-
"recursiveReadOnlyMounts": "RecursiveReadOnlyMounts is set to true if the runtime class supports RecursiveReadOnlyMounts.",
1227+
var map_NodeRuntimeHandlerFeatures = map[string]string{
1228+
"": "NodeRuntimeHandlerFeatures is a set of runtime features.",
1229+
"recursiveReadOnlyMounts": "RecursiveReadOnlyMounts is set to true if the runtime handler supports RecursiveReadOnlyMounts.",
12301230
}
12311231

1232-
func (NodeRuntimeClassFeatures) SwaggerDoc() map[string]string {
1233-
return map_NodeRuntimeClassFeatures
1232+
func (NodeRuntimeHandlerFeatures) SwaggerDoc() map[string]string {
1233+
return map_NodeRuntimeHandlerFeatures
12341234
}
12351235

12361236
var map_NodeSelector = map[string]string{
@@ -1291,7 +1291,7 @@ var map_NodeStatus = map[string]string{
12911291
"volumesInUse": "List of attachable volumes in use (mounted) by the node.",
12921292
"volumesAttached": "List of volumes that are attached to the node.",
12931293
"config": "Status of the config assigned to the node via the dynamic Kubelet config feature.",
1294-
"runtimeClasses": "The available runtime classes.",
1294+
"runtimeHandlers": "The available runtime handlers.",
12951295
}
12961296

12971297
func (NodeStatus) SwaggerDoc() map[string]string {

core/v1/zz_generated.deepcopy.go

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

testdata/HEAD/core.v1.Node.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
},
158158
"error": "errorValue"
159159
},
160-
"runtimeClasses": [
160+
"runtimeHandlers": [
161161
{
162162
"name": "nameValue",
163163
"features": {

testdata/HEAD/core.v1.Node.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ status:
108108
osImage: osImageValue
109109
systemUUID: systemUUIDValue
110110
phase: phaseValue
111-
runtimeClasses:
111+
runtimeHandlers:
112112
- features:
113113
recursiveReadOnlyMounts: true
114114
name: nameValue

0 commit comments

Comments
 (0)