mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #125576 from alvaroaleman/fix
Corev1.Node: Link to node doc and not PV doc in status.capacity
This commit is contained in:
commit
3ee4d98364
2
api/openapi-spec/swagger.json
generated
2
api/openapi-spec/swagger.json
generated
@ -8432,7 +8432,7 @@
|
|||||||
"additionalProperties": {
|
"additionalProperties": {
|
||||||
"$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity"
|
"$ref": "#/definitions/io.k8s.apimachinery.pkg.api.resource.Quantity"
|
||||||
},
|
},
|
||||||
"description": "Capacity represents the total resources of a node. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity",
|
"description": "Capacity represents the total resources of a node. More info: https://kubernetes.io/docs/reference/node/node-status/#capacity",
|
||||||
"type": "object"
|
"type": "object"
|
||||||
},
|
},
|
||||||
"conditions": {
|
"conditions": {
|
||||||
|
@ -3989,7 +3989,7 @@
|
|||||||
"additionalProperties": {
|
"additionalProperties": {
|
||||||
"$ref": "#/components/schemas/io.k8s.apimachinery.pkg.api.resource.Quantity"
|
"$ref": "#/components/schemas/io.k8s.apimachinery.pkg.api.resource.Quantity"
|
||||||
},
|
},
|
||||||
"description": "Capacity represents the total resources of a node. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity",
|
"description": "Capacity represents the total resources of a node. More info: https://kubernetes.io/docs/reference/node/node-status/#capacity",
|
||||||
"type": "object"
|
"type": "object"
|
||||||
},
|
},
|
||||||
"conditions": {
|
"conditions": {
|
||||||
|
2
pkg/generated/openapi/zz_generated.openapi.go
generated
2
pkg/generated/openapi/zz_generated.openapi.go
generated
@ -24804,7 +24804,7 @@ func schema_k8sio_api_core_v1_NodeStatus(ref common.ReferenceCallback) common.Op
|
|||||||
Properties: map[string]spec.Schema{
|
Properties: map[string]spec.Schema{
|
||||||
"capacity": {
|
"capacity": {
|
||||||
SchemaProps: spec.SchemaProps{
|
SchemaProps: spec.SchemaProps{
|
||||||
Description: "Capacity represents the total resources of a node. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity",
|
Description: "Capacity represents the total resources of a node. More info: https://kubernetes.io/docs/reference/node/node-status/#capacity",
|
||||||
Type: []string{"object"},
|
Type: []string{"object"},
|
||||||
AdditionalProperties: &spec.SchemaOrBool{
|
AdditionalProperties: &spec.SchemaOrBool{
|
||||||
Allows: true,
|
Allows: true,
|
||||||
|
@ -2740,7 +2740,7 @@ message NodeSpec {
|
|||||||
// NodeStatus is information about the current status of a node.
|
// NodeStatus is information about the current status of a node.
|
||||||
message NodeStatus {
|
message NodeStatus {
|
||||||
// Capacity represents the total resources of a node.
|
// Capacity represents the total resources of a node.
|
||||||
// More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity
|
// More info: https://kubernetes.io/docs/reference/node/node-status/#capacity
|
||||||
// +optional
|
// +optional
|
||||||
map<string, .k8s.io.apimachinery.pkg.api.resource.Quantity> capacity = 1;
|
map<string, .k8s.io.apimachinery.pkg.api.resource.Quantity> capacity = 1;
|
||||||
|
|
||||||
|
@ -5948,7 +5948,7 @@ type NodeConfigStatus struct {
|
|||||||
// NodeStatus is information about the current status of a node.
|
// NodeStatus is information about the current status of a node.
|
||||||
type NodeStatus struct {
|
type NodeStatus struct {
|
||||||
// Capacity represents the total resources of a node.
|
// Capacity represents the total resources of a node.
|
||||||
// More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity
|
// More info: https://kubernetes.io/docs/reference/node/node-status/#capacity
|
||||||
// +optional
|
// +optional
|
||||||
Capacity ResourceList `json:"capacity,omitempty" protobuf:"bytes,1,rep,name=capacity,casttype=ResourceList,castkey=ResourceName"`
|
Capacity ResourceList `json:"capacity,omitempty" protobuf:"bytes,1,rep,name=capacity,casttype=ResourceList,castkey=ResourceName"`
|
||||||
// Allocatable represents the resources of a node that are available for scheduling.
|
// Allocatable represents the resources of a node that are available for scheduling.
|
||||||
|
@ -1301,7 +1301,7 @@ func (NodeSpec) SwaggerDoc() map[string]string {
|
|||||||
|
|
||||||
var map_NodeStatus = map[string]string{
|
var map_NodeStatus = map[string]string{
|
||||||
"": "NodeStatus is information about the current status of a node.",
|
"": "NodeStatus is information about the current status of a node.",
|
||||||
"capacity": "Capacity represents the total resources of a node. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity",
|
"capacity": "Capacity represents the total resources of a node. More info: https://kubernetes.io/docs/reference/node/node-status/#capacity",
|
||||||
"allocatable": "Allocatable represents the resources of a node that are available for scheduling. Defaults to Capacity.",
|
"allocatable": "Allocatable represents the resources of a node that are available for scheduling. Defaults to Capacity.",
|
||||||
"phase": "NodePhase is the recently observed lifecycle phase of the node. More info: https://kubernetes.io/docs/concepts/nodes/node/#phase The field is never populated, and now is deprecated.",
|
"phase": "NodePhase is the recently observed lifecycle phase of the node. More info: https://kubernetes.io/docs/concepts/nodes/node/#phase The field is never populated, and now is deprecated.",
|
||||||
"conditions": "Conditions is an array of current observed node conditions. More info: https://kubernetes.io/docs/concepts/nodes/node/#condition",
|
"conditions": "Conditions is an array of current observed node conditions. More info: https://kubernetes.io/docs/concepts/nodes/node/#condition",
|
||||||
|
Loading…
Reference in New Issue
Block a user