Capacity -> Allcatable in NodeTopology

Signed-off-by: Arnob kumar saha <[email protected]>
kmodules · Dec 25, 2023 · 4ae6613 · 4ae6613
1 parent f9e0093
commit 4ae6613
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 21 deletions.
diff --git a/apis/core/v1alpha1/zz_generated.deepcopy.go b/apis/core/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/meta/v1alpha1/zz_generated.deepcopy.go b/apis/meta/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/node/doc.go b/apis/node/doc.go
@@ -19,3 +19,5 @@ package node
 const (
 	GroupName = "node.k8s.appscode.com"
 )
+
+
diff --git a/apis/node/install/install.go b/apis/node/install/install.go
@@ -17,6 +17,7 @@ limitations under the License.
 package install
 
 import (
+
 	"kmodules.xyz/resource-metadata/apis/node/v1alpha1"
 
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/apis/node/install/roundtrip_test.go b/apis/node/install/roundtrip_test.go
@@ -19,6 +19,7 @@ package install
 import (
 	"testing"
 
+
 	"k8s.io/apimachinery/pkg/api/apitesting/roundtrip"
 )
 

diff --git a/apis/node/v1alpha1/doc.go b/apis/node/v1alpha1/doc.go
@@ -21,3 +21,5 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=node.k8s.appscode.com
 package v1alpha1
+
+
diff --git a/apis/node/v1alpha1/nodetopology_helpers.go b/apis/node/v1alpha1/nodetopology_helpers.go
@@ -17,8 +17,10 @@ limitations under the License.
 package v1alpha1
 
 import (
+
 	"kmodules.xyz/client-go/apiextensions"
 	"kmodules.xyz/resource-metadata/crds"
+
 )
 
 func (v NodeTopology) CustomResourceDefinition() *apiextensions.CustomResourceDefinition {

diff --git a/apis/node/v1alpha1/nodetopology_types.go b/apis/node/v1alpha1/nodetopology_types.go
@@ -17,6 +17,8 @@ limitations under the License.
 package v1alpha1
 
 import (
+
+
 	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -52,9 +54,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

diff --git a/apis/node/v1alpha1/openapi_generated.go b/apis/node/v1alpha1/openapi_generated.go
diff --git a/apis/node/v1alpha1/register.go b/apis/node/v1alpha1/register.go
@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
+
 	"kmodules.xyz/resource-metadata/apis/node"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/apis/node/v1alpha1/zz_generated.deepcopy.go b/apis/node/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/ui/v1alpha1/zz_generated.deepcopy.go b/apis/ui/v1alpha1/zz_generated.deepcopy.go
diff --git a/crds/node.k8s.appscode.com_nodetopologies.yaml b/crds/node.k8s.appscode.com_nodetopologies.yaml
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,5 @@ package node
		const (
		GroupName = "node.k8s.appscode.com"
		)
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ package install @@
     import (
     	"testing"
     	"k8s.io/apimachinery/pkg/api/apitesting/roundtrip"
     )
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,3 +21,5 @@ limitations under the License.
		// +k8s:defaulter-gen=TypeMeta
		// +groupName=node.k8s.appscode.com
		package v1alpha1