Skip to content

Commit 5d75660

Browse files
committed
KEP-3619: API: add NodeFeatures.SupplementalGroupsPolicy in NodeStatus
KEP-3619: don't capitalize comment in K8S API KEP-3619: fix typos and grammatical ones in K8s API KEP-3619: rephrase NodeFeatures, NodeHandlerFeatures in K8s API
1 parent 38e4c6b commit 5d75660

File tree

18 files changed

+1591
-1124
lines changed

18 files changed

+1591
-1124
lines changed

api/openapi-spec/swagger.json

Lines changed: 15 additions & 1 deletion
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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3741,6 +3741,16 @@
37413741
},
37423742
"type": "object"
37433743
},
3744+
"io.k8s.api.core.v1.NodeFeatures": {
3745+
"description": "NodeFeatures describes the set of features implemented by the CRI implementation. The features contained in the NodeFeatures should depend only on the cri implementation independent of runtime handlers.",
3746+
"properties": {
3747+
"supplementalGroupsPolicy": {
3748+
"description": "SupplementalGroupsPolicy is set to true if the runtime supports SupplementalGroupsPolicy and ContainerUser.",
3749+
"type": "boolean"
3750+
}
3751+
},
3752+
"type": "object"
3753+
},
37443754
"io.k8s.api.core.v1.NodeList": {
37453755
"description": "NodeList is the whole list of all Nodes which have been registered with master.",
37463756
"properties": {
@@ -3806,7 +3816,7 @@
38063816
"type": "object"
38073817
},
38083818
"io.k8s.api.core.v1.NodeRuntimeHandlerFeatures": {
3809-
"description": "NodeRuntimeHandlerFeatures is a set of runtime features.",
3819+
"description": "NodeRuntimeHandlerFeatures is a set of features implemented by the runtime handler.",
38103820
"properties": {
38113821
"recursiveReadOnlyMounts": {
38123822
"description": "RecursiveReadOnlyMounts is set to true if the runtime handler supports RecursiveReadOnlyMounts.",
@@ -4027,6 +4037,14 @@
40274037
"default": {},
40284038
"description": "Endpoints of daemons running on the Node."
40294039
},
4040+
"features": {
4041+
"allOf": [
4042+
{
4043+
"$ref": "#/components/schemas/io.k8s.api.core.v1.NodeFeatures"
4044+
}
4045+
],
4046+
"description": "Features describes the set of features implemented by the CRI implementation."
4047+
},
40304048
"images": {
40314049
"description": "List of container images on this node",
40324050
"items": {

pkg/apis/core/types.go

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4892,7 +4892,7 @@ type NodeDaemonEndpoints struct {
48924892
KubeletEndpoint DaemonEndpoint
48934893
}
48944894

4895-
// NodeRuntimeHandlerFeatures is a set of runtime features.
4895+
// NodeRuntimeHandlerFeatures is a set of features implemented by the runtime handler.
48964896
type NodeRuntimeHandlerFeatures struct {
48974897
// RecursiveReadOnlyMounts is set to true if the runtime handler supports RecursiveReadOnlyMounts.
48984898
// +featureGate=RecursiveReadOnlyMounts
@@ -4915,6 +4915,15 @@ type NodeRuntimeHandler struct {
49154915
Features *NodeRuntimeHandlerFeatures
49164916
}
49174917

4918+
// NodeFeatures describes the set of features implemented by the CRI implementation.
4919+
// The features contained in the NodeFeatures should depend only on the cri implementation
4920+
// independent of runtime handlers.
4921+
type NodeFeatures struct {
4922+
// SupplementalGroupsPolicy is set to true if the runtime supports SupplementalGroupsPolicy and ContainerUser.
4923+
// +optional
4924+
SupplementalGroupsPolicy *bool
4925+
}
4926+
49184927
// NodeSystemInfo is a set of ids/uuids to uniquely identify the node.
49194928
type NodeSystemInfo struct {
49204929
// MachineID reported by the node. For unique machine identification
@@ -5030,6 +5039,10 @@ type NodeStatus struct {
50305039
// +featureGate=UserNamespacesSupport
50315040
// +optional
50325041
RuntimeHandlers []NodeRuntimeHandler
5042+
// Features describes the set of features implemented by the CRI implementation.
5043+
// +featureGate=SupplementalGroupsPolicy
5044+
// +optional
5045+
Features *NodeFeatures
50335046
}
50345047

50355048
// UniqueVolumeName defines the name of attached volume

pkg/apis/core/v1/zz_generated.conversion.go

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/core/zz_generated.deepcopy.go

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/generated/openapi/zz_generated.openapi.go

Lines changed: 29 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)