Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Capacity -> Allcatable in NodeTopology #395

Merged
merged 2 commits into from
Dec 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apis/node/v1alpha1/nodetopology_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ type NodeTopologySpec struct {

type NodeGroup struct {
TopologyValue string `json:"topologyValue"`
// Capacity represents the total resources of a node.
// Allocatable represents the total resources of a node.
// More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity
Capacity core.ResourceList `json:"capacity"`
Allocatable core.ResourceList `json:"allocatable"`
}

// +kubebuilder:validation:Enum=LabelSelector;Taint
Expand Down
6 changes: 3 additions & 3 deletions apis/node/v1alpha1/openapi_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions apis/node/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions crds/node.k8s.appscode.com_nodetopologies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,20 @@ spec:
nodeGroups:
items:
properties:
capacity:
allocatable:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Capacity represents the total resources of a node.
More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity'
description: 'Allocatable represents the total resources of
a node. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity'
type: object
topologyValue:
type: string
required:
- capacity
- allocatable
- topologyValue
type: object
type: array
Expand Down
Loading