diff --git a/pkg/apis/cluster/mutation/mutation.go b/pkg/apis/cluster/mutation/mutation.go index 7f43f6e1c47c..5934d35dc9d4 100644 --- a/pkg/apis/cluster/mutation/mutation.go +++ b/pkg/apis/cluster/mutation/mutation.go @@ -68,12 +68,12 @@ func SetDefaultClusterResourceModels(cluster *clusterapis.Cluster) { Grade: 0, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(0, resource.BinarySI), Max: *resource.NewQuantity(4*GB, resource.BinarySI), }, @@ -83,12 +83,12 @@ func SetDefaultClusterResourceModels(cluster *clusterapis.Cluster) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(4*GB, resource.BinarySI), Max: *resource.NewQuantity(16*GB, resource.BinarySI), }, @@ -98,12 +98,12 @@ func SetDefaultClusterResourceModels(cluster *clusterapis.Cluster) { Grade: 2, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(2, resource.DecimalSI), Max: *resource.NewQuantity(4, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(16*GB, resource.BinarySI), Max: *resource.NewQuantity(32*GB, resource.BinarySI), }, @@ -113,12 +113,12 @@ func SetDefaultClusterResourceModels(cluster *clusterapis.Cluster) { Grade: 3, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(4, resource.DecimalSI), Max: *resource.NewQuantity(8, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(32*GB, resource.BinarySI), Max: *resource.NewQuantity(64*GB, resource.BinarySI), }, @@ -128,12 +128,12 @@ func SetDefaultClusterResourceModels(cluster *clusterapis.Cluster) { Grade: 4, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(8, resource.DecimalSI), Max: *resource.NewQuantity(16, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(64*GB, resource.BinarySI), Max: *resource.NewQuantity(128*GB, resource.BinarySI), }, @@ -143,12 +143,12 @@ func SetDefaultClusterResourceModels(cluster *clusterapis.Cluster) { Grade: 5, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(16, resource.DecimalSI), Max: *resource.NewQuantity(32, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(128*GB, resource.BinarySI), Max: *resource.NewQuantity(256*GB, resource.BinarySI), }, @@ -158,12 +158,12 @@ func SetDefaultClusterResourceModels(cluster *clusterapis.Cluster) { Grade: 6, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(32, resource.DecimalSI), Max: *resource.NewQuantity(64, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(256*GB, resource.BinarySI), Max: *resource.NewQuantity(512*GB, resource.BinarySI), }, @@ -173,12 +173,12 @@ func SetDefaultClusterResourceModels(cluster *clusterapis.Cluster) { Grade: 7, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(64, resource.DecimalSI), Max: *resource.NewQuantity(128, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(512*GB, resource.BinarySI), Max: *resource.NewQuantity(1024*GB, resource.BinarySI), }, @@ -188,12 +188,12 @@ func SetDefaultClusterResourceModels(cluster *clusterapis.Cluster) { Grade: 8, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(128, resource.DecimalSI), Max: *resource.NewQuantity(math.MaxInt64, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(1024*GB, resource.BinarySI), Max: *resource.NewQuantity(math.MaxInt64, resource.BinarySI), }, diff --git a/pkg/apis/cluster/mutation/mutation_test.go b/pkg/apis/cluster/mutation/mutation_test.go index 98768b08b3b5..e97ae88e9aa0 100644 --- a/pkg/apis/cluster/mutation/mutation_test.go +++ b/pkg/apis/cluster/mutation/mutation_test.go @@ -84,7 +84,7 @@ func TestStandardizeClusterResourceModels(t *testing.T) { Grade: 2, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(2, resource.DecimalSI), Max: *resource.NewQuantity(math.MaxInt64, resource.DecimalSI), }, @@ -94,7 +94,7 @@ func TestStandardizeClusterResourceModels(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, @@ -106,7 +106,7 @@ func TestStandardizeClusterResourceModels(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, @@ -116,7 +116,7 @@ func TestStandardizeClusterResourceModels(t *testing.T) { Grade: 2, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(2, resource.DecimalSI), Max: *resource.NewQuantity(math.MaxInt64, resource.DecimalSI), }, @@ -130,7 +130,7 @@ func TestStandardizeClusterResourceModels(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(math.MaxInt64, resource.DecimalSI), }, @@ -142,7 +142,7 @@ func TestStandardizeClusterResourceModels(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(math.MaxInt64, resource.DecimalSI), }, @@ -156,7 +156,7 @@ func TestStandardizeClusterResourceModels(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, @@ -168,7 +168,7 @@ func TestStandardizeClusterResourceModels(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(math.MaxInt64, resource.DecimalSI), }, @@ -206,12 +206,12 @@ func TestSetDefaultClusterResourceModels(t *testing.T) { Grade: 0, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(0, resource.BinarySI), Max: *resource.NewQuantity(4*GB, resource.BinarySI), }, @@ -221,12 +221,12 @@ func TestSetDefaultClusterResourceModels(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(4*GB, resource.BinarySI), Max: *resource.NewQuantity(16*GB, resource.BinarySI), }, @@ -236,12 +236,12 @@ func TestSetDefaultClusterResourceModels(t *testing.T) { Grade: 2, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(2, resource.DecimalSI), Max: *resource.NewQuantity(4, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(16*GB, resource.BinarySI), Max: *resource.NewQuantity(32*GB, resource.BinarySI), }, @@ -251,12 +251,12 @@ func TestSetDefaultClusterResourceModels(t *testing.T) { Grade: 3, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(4, resource.DecimalSI), Max: *resource.NewQuantity(8, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(32*GB, resource.BinarySI), Max: *resource.NewQuantity(64*GB, resource.BinarySI), }, @@ -266,12 +266,12 @@ func TestSetDefaultClusterResourceModels(t *testing.T) { Grade: 4, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(8, resource.DecimalSI), Max: *resource.NewQuantity(16, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(64*GB, resource.BinarySI), Max: *resource.NewQuantity(128*GB, resource.BinarySI), }, @@ -281,12 +281,12 @@ func TestSetDefaultClusterResourceModels(t *testing.T) { Grade: 5, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(16, resource.DecimalSI), Max: *resource.NewQuantity(32, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(128*GB, resource.BinarySI), Max: *resource.NewQuantity(256*GB, resource.BinarySI), }, @@ -296,12 +296,12 @@ func TestSetDefaultClusterResourceModels(t *testing.T) { Grade: 6, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(32, resource.DecimalSI), Max: *resource.NewQuantity(64, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(256*GB, resource.BinarySI), Max: *resource.NewQuantity(512*GB, resource.BinarySI), }, @@ -311,12 +311,12 @@ func TestSetDefaultClusterResourceModels(t *testing.T) { Grade: 7, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(64, resource.DecimalSI), Max: *resource.NewQuantity(128, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(512*GB, resource.BinarySI), Max: *resource.NewQuantity(1024*GB, resource.BinarySI), }, @@ -326,12 +326,12 @@ func TestSetDefaultClusterResourceModels(t *testing.T) { Grade: 8, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(128, resource.DecimalSI), Max: *resource.NewQuantity(math.MaxInt64, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(1024*GB, resource.BinarySI), Max: *resource.NewQuantity(math.MaxInt64, resource.BinarySI), }, diff --git a/pkg/apis/cluster/types.go b/pkg/apis/cluster/types.go index 99ee72a46a71..719d912fa830 100644 --- a/pkg/apis/cluster/types.go +++ b/pkg/apis/cluster/types.go @@ -6,26 +6,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// ResourceName is the name identifying various resources in a ResourceList. -type ResourceName string - -// Resource names must be not more than 63 characters, consisting of upper- or lower-case alphanumeric characters, -// with the -, _, and . characters allowed anywhere, except the first or last character. -// The default convention, matching that for annotations, is to use lower-case names, with dashes, rather than -// camel case, separating compound words. -// Fully-qualified resource typenames are constructed from a DNS-style subdomain, followed by a slash `/` and a name. -const ( - // ResourceCPU in cores. (e,g. 500m = .5 cores) - ResourceCPU ResourceName = "cpu" - // ResourceMemory in bytes. (e,g. 500Gi = 500GiB = 500 * 1024 * 1024 * 1024) - ResourceMemory ResourceName = "memory" - // ResourceStorage is volume size, in bytes (e,g. 5Gi = 5GiB = 5 * 1024 * 1024 * 1024) - ResourceStorage ResourceName = "storage" - // ResourceEphemeralStorage is local ephemeral storage, in bytes. (e,g. 500Gi = 500GiB = 500 * 1024 * 1024 * 1024) - // The resource name for ResourceEphemeralStorage is alpha and it can change across releases. - ResourceEphemeralStorage ResourceName = "ephemeral-storage" -) - //revive:disable:exported // +genclient @@ -217,7 +197,7 @@ type ResourceModel struct { type ResourceModelRange struct { // Name is the name for the resource that you want to categorize. // +required - Name ResourceName + Name corev1.ResourceName // Min is the minimum amount of this resource represented by resource name. // Note: The Min value of first grade(usually 0) always acts as zero. diff --git a/pkg/apis/cluster/v1alpha1/types.go b/pkg/apis/cluster/v1alpha1/types.go index d8bd4e902570..262856e2ce10 100644 --- a/pkg/apis/cluster/v1alpha1/types.go +++ b/pkg/apis/cluster/v1alpha1/types.go @@ -17,26 +17,6 @@ const ( ResourceNamespaceScopedCluster = false ) -// ResourceName is the name identifying various resources in a ResourceList. -type ResourceName string - -// Resource names must be not more than 63 characters, consisting of upper- or lower-case alphanumeric characters, -// with the -, _, and . characters allowed anywhere, except the first or last character. -// The default convention, matching that for annotations, is to use lower-case names, with dashes, rather than -// camel case, separating compound words. -// Fully-qualified resource typenames are constructed from a DNS-style subdomain, followed by a slash `/` and a name. -const ( - // ResourceCPU in cores. (e,g. 500m = .5 cores) - ResourceCPU ResourceName = "cpu" - // ResourceMemory in bytes. (e,g. 500Gi = 500GiB = 500 * 1024 * 1024 * 1024) - ResourceMemory ResourceName = "memory" - // ResourceStorage is volume size, in bytes (e,g. 5Gi = 5GiB = 5 * 1024 * 1024 * 1024) - ResourceStorage ResourceName = "storage" - // ResourceEphemeralStorage is local ephemeral storage, in bytes. (e,g. 500Gi = 500GiB = 500 * 1024 * 1024 * 1024) - // The resource name for ResourceEphemeralStorage is alpha and it can change across releases. - ResourceEphemeralStorage ResourceName = "ephemeral-storage" -) - // +genclient // +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object @@ -229,7 +209,7 @@ type ResourceModel struct { type ResourceModelRange struct { // Name is the name for the resource that you want to categorize. // +required - Name ResourceName `json:"name"` + Name corev1.ResourceName `json:"name"` // Min is the minimum amount of this resource represented by resource name. // Note: The Min value of first grade(usually 0) always acts as zero. diff --git a/pkg/apis/cluster/v1alpha1/zz_generated.conversion.go b/pkg/apis/cluster/v1alpha1/zz_generated.conversion.go index 79e7ccfd9ec7..1f4c50c6670a 100644 --- a/pkg/apis/cluster/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/cluster/v1alpha1/zz_generated.conversion.go @@ -460,7 +460,7 @@ func Convert_cluster_ResourceModel_To_v1alpha1_ResourceModel(in *cluster.Resourc } func autoConvert_v1alpha1_ResourceModelRange_To_cluster_ResourceModelRange(in *ResourceModelRange, out *cluster.ResourceModelRange, s conversion.Scope) error { - out.Name = cluster.ResourceName(in.Name) + out.Name = v1.ResourceName(in.Name) out.Min = in.Min out.Max = in.Max return nil @@ -472,7 +472,7 @@ func Convert_v1alpha1_ResourceModelRange_To_cluster_ResourceModelRange(in *Resou } func autoConvert_cluster_ResourceModelRange_To_v1alpha1_ResourceModelRange(in *cluster.ResourceModelRange, out *ResourceModelRange, s conversion.Scope) error { - out.Name = ResourceName(in.Name) + out.Name = v1.ResourceName(in.Name) out.Min = in.Min out.Max = in.Max return nil diff --git a/pkg/apis/cluster/validation/validation.go b/pkg/apis/cluster/validation/validation.go index e61c43aa5e6b..9cdb43ca9522 100644 --- a/pkg/apis/cluster/validation/validation.go +++ b/pkg/apis/cluster/validation/validation.go @@ -38,8 +38,7 @@ func ValidateClusterName(name string) []string { } var ( - supportedSyncModes = sets.NewString(string(api.Pull), string(api.Push)) - supportedResourceNames = sets.NewString(string(api.ResourceCPU), string(api.ResourceMemory), string(api.ResourceStorage), string(api.ResourceEphemeralStorage)) + supportedSyncModes = sets.NewString(string(api.Pull), string(api.Push)) ) // ValidateCluster tests if required fields in the Cluster are set. @@ -192,9 +191,6 @@ func ValidateClusterResourceModels(fldPath *field.Path, models []api.ResourceMod } for j, resourceModelRange := range resourceModel.Ranges { - if !supportedResourceNames.Has(string(resourceModelRange.Name)) { - return field.NotSupported(fldPath.Child("ranges").Child("name"), resourceModelRange.Name, supportedResourceNames.List()) - } if resourceModelRange.Max.Cmp(resourceModelRange.Min) <= 0 { return field.Invalid(fldPath, models, "The max value of each resource must be greater than the min value") } diff --git a/pkg/apis/cluster/validation/validation_test.go b/pkg/apis/cluster/validation/validation_test.go index f18b952abafa..431a59cd3adb 100644 --- a/pkg/apis/cluster/validation/validation_test.go +++ b/pkg/apis/cluster/validation/validation_test.go @@ -98,7 +98,7 @@ func TestValidateCluster(t *testing.T) { Grade: 1, Ranges: []api.ResourceModelRange{ { - Name: api.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, @@ -108,7 +108,7 @@ func TestValidateCluster(t *testing.T) { Grade: 2, Ranges: []api.ResourceModelRange{ { - Name: api.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(2, resource.DecimalSI), Max: *resource.NewQuantity(math.MaxInt64, resource.DecimalSI), }, @@ -128,7 +128,7 @@ func TestValidateCluster(t *testing.T) { Grade: 1, Ranges: []api.ResourceModelRange{ { - Name: api.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, @@ -138,12 +138,12 @@ func TestValidateCluster(t *testing.T) { Grade: 2, Ranges: []api.ResourceModelRange{ { - Name: api.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(2, resource.DecimalSI), Max: *resource.NewQuantity(math.MaxInt64, resource.DecimalSI), }, { - Name: api.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(2, resource.DecimalSI), Max: *resource.NewQuantity(math.MaxInt64, resource.DecimalSI), }, @@ -163,7 +163,7 @@ func TestValidateCluster(t *testing.T) { Grade: 1, Ranges: []api.ResourceModelRange{ { - Name: api.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(2, resource.DecimalSI), Max: *resource.NewQuantity(0, resource.DecimalSI), }, @@ -183,7 +183,7 @@ func TestValidateCluster(t *testing.T) { Grade: 1, Ranges: []api.ResourceModelRange{ { - Name: api.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(math.MaxInt64, resource.DecimalSI), }, @@ -203,7 +203,7 @@ func TestValidateCluster(t *testing.T) { Grade: 1, Ranges: []api.ResourceModelRange{ { - Name: api.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, @@ -223,7 +223,7 @@ func TestValidateCluster(t *testing.T) { Grade: 1, Ranges: []api.ResourceModelRange{ { - Name: api.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, @@ -233,7 +233,7 @@ func TestValidateCluster(t *testing.T) { Grade: 2, Ranges: []api.ResourceModelRange{ { - Name: api.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewQuantity(2, resource.DecimalSI), Max: *resource.NewQuantity(math.MaxInt64, resource.DecimalSI), }, @@ -253,7 +253,7 @@ func TestValidateCluster(t *testing.T) { Grade: 1, Ranges: []api.ResourceModelRange{ { - Name: api.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, @@ -263,7 +263,7 @@ func TestValidateCluster(t *testing.T) { Grade: 2, Ranges: []api.ResourceModelRange{ { - Name: api.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(math.MaxInt64, resource.DecimalSI), }, diff --git a/pkg/controllers/status/cluster_status_controller_test.go b/pkg/controllers/status/cluster_status_controller_test.go index ead499eb8c5e..9c478c2ccdb4 100644 --- a/pkg/controllers/status/cluster_status_controller_test.go +++ b/pkg/controllers/status/cluster_status_controller_test.go @@ -605,12 +605,12 @@ func TestGetAllocatableModelings(t *testing.T) { Grade: 0, Ranges: []clusterv1alpha1.ResourceModelRange{ { - Name: clusterv1alpha1.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1, resource.DecimalSI), }, { - Name: clusterv1alpha1.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1024, resource.DecimalSI), }, @@ -620,12 +620,12 @@ func TestGetAllocatableModelings(t *testing.T) { Grade: 1, Ranges: []clusterv1alpha1.ResourceModelRange{ { - Name: clusterv1alpha1.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, { - Name: clusterv1alpha1.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(1024, resource.DecimalSI), Max: *resource.NewQuantity(1024*2, resource.DecimalSI), }, @@ -717,12 +717,12 @@ func TestGetAllocatableModelings(t *testing.T) { Grade: 0, Ranges: []clusterv1alpha1.ResourceModelRange{ { - Name: clusterv1alpha1.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1, resource.DecimalSI), }, { - Name: clusterv1alpha1.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1024, resource.DecimalSI), }, @@ -732,7 +732,7 @@ func TestGetAllocatableModelings(t *testing.T) { Grade: 1, Ranges: []clusterv1alpha1.ResourceModelRange{ { - Name: clusterv1alpha1.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, @@ -784,12 +784,12 @@ func TestGetAllocatableModelings(t *testing.T) { Grade: 0, Ranges: []clusterv1alpha1.ResourceModelRange{ { - Name: clusterv1alpha1.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1, resource.DecimalSI), }, { - Name: clusterv1alpha1.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1024, resource.DecimalSI), }, @@ -799,12 +799,12 @@ func TestGetAllocatableModelings(t *testing.T) { Grade: 1, Ranges: []clusterv1alpha1.ResourceModelRange{ { - Name: clusterv1alpha1.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, { - Name: clusterv1alpha1.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(1024, resource.DecimalSI), Max: *resource.NewQuantity(1024*2, resource.DecimalSI), }, @@ -850,12 +850,12 @@ func TestClusterStatusController_updateStatusIfNeeded(t *testing.T) { Grade: 0, Ranges: []clusterv1alpha1.ResourceModelRange{ { - Name: clusterv1alpha1.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1, resource.DecimalSI), }, { - Name: clusterv1alpha1.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1024, resource.DecimalSI), }, @@ -865,12 +865,12 @@ func TestClusterStatusController_updateStatusIfNeeded(t *testing.T) { Grade: 1, Ranges: []clusterv1alpha1.ResourceModelRange{ { - Name: clusterv1alpha1.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, { - Name: clusterv1alpha1.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(1024, resource.DecimalSI), Max: *resource.NewQuantity(1024*2, resource.DecimalSI), }, @@ -917,12 +917,12 @@ func TestClusterStatusController_updateStatusIfNeeded(t *testing.T) { Grade: 0, Ranges: []clusterv1alpha1.ResourceModelRange{ { - Name: clusterv1alpha1.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1, resource.DecimalSI), }, { - Name: clusterv1alpha1.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1024, resource.DecimalSI), }, @@ -932,12 +932,12 @@ func TestClusterStatusController_updateStatusIfNeeded(t *testing.T) { Grade: 1, Ranges: []clusterv1alpha1.ResourceModelRange{ { - Name: clusterv1alpha1.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, { - Name: clusterv1alpha1.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(1024, resource.DecimalSI), Max: *resource.NewQuantity(1024*2, resource.DecimalSI), }, @@ -1040,12 +1040,12 @@ func TestClusterStatusController_initLeaseController(t *testing.T) { Grade: 0, Ranges: []clusterv1alpha1.ResourceModelRange{ { - Name: clusterv1alpha1.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1, resource.DecimalSI), }, { - Name: clusterv1alpha1.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1024, resource.DecimalSI), }, @@ -1055,12 +1055,12 @@ func TestClusterStatusController_initLeaseController(t *testing.T) { Grade: 1, Ranges: []clusterv1alpha1.ResourceModelRange{ { - Name: clusterv1alpha1.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, { - Name: clusterv1alpha1.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(1024, resource.DecimalSI), Max: *resource.NewQuantity(1024*2, resource.DecimalSI), }, diff --git a/pkg/estimator/client/general.go b/pkg/estimator/client/general.go index 0447e5a45857..ab84a691d8df 100644 --- a/pkg/estimator/client/general.go +++ b/pkg/estimator/client/general.go @@ -96,8 +96,8 @@ func getAllowedPodNumber(resourceSummary *clusterv1alpha1.ResourceSummary) int64 return allowedPodNumber } -func convertToResourceModelsMinMap(models []clusterv1alpha1.ResourceModel) map[clusterv1alpha1.ResourceName][]resource.Quantity { - resourceModelsMinMap := make(map[clusterv1alpha1.ResourceName][]resource.Quantity) +func convertToResourceModelsMinMap(models []clusterv1alpha1.ResourceModel) map[corev1.ResourceName][]resource.Quantity { + resourceModelsMinMap := make(map[corev1.ResourceName][]resource.Quantity) for _, model := range models { for _, resourceModelRange := range model.Ranges { resourceModelsMinMap[resourceModelRange.Name] = append(resourceModelsMinMap[resourceModelRange.Name], resourceModelRange.Min) @@ -107,7 +107,7 @@ func convertToResourceModelsMinMap(models []clusterv1alpha1.ResourceModel) map[c return resourceModelsMinMap } -func getNodeAvailableReplicas(modelIndex int, replicaRequirements *workv1alpha2.ReplicaRequirements, resourceModelsMinMap map[clusterv1alpha1.ResourceName][]resource.Quantity) int64 { +func getNodeAvailableReplicas(modelIndex int, replicaRequirements *workv1alpha2.ReplicaRequirements, resourceModelsMinMap map[corev1.ResourceName][]resource.Quantity) int64 { var maximumReplicasOneNode int64 = math.MaxInt64 for key, value := range replicaRequirements.ResourceRequest { requestedQuantity := value.Value() @@ -115,7 +115,7 @@ func getNodeAvailableReplicas(modelIndex int, replicaRequirements *workv1alpha2. continue } - availableMinBoundary := resourceModelsMinMap[clusterv1alpha1.ResourceName(key)][modelIndex] + availableMinBoundary := resourceModelsMinMap[key][modelIndex] availableQuantity := availableMinBoundary.Value() if key == corev1.ResourceCPU { @@ -188,7 +188,7 @@ func getMaximumReplicasBasedOnResourceModels(cluster *clusterv1alpha1.Cluster, r continue } - quantityArray, ok := resourceModelsMinMap[clusterv1alpha1.ResourceName(key)] + quantityArray, ok := resourceModelsMinMap[key] if !ok { return -1, fmt.Errorf("resource model is inapplicable as missing resource: %s", string(key)) } diff --git a/pkg/modeling/modeling.go b/pkg/modeling/modeling.go index 709c8f18a4d5..86efcb1c23c8 100644 --- a/pkg/modeling/modeling.go +++ b/pkg/modeling/modeling.go @@ -17,7 +17,7 @@ import ( type ResourceSummary struct { RMs []resourceModels modelSortings [][]resource.Quantity - modelSortingResourceNames []clusterapis.ResourceName + modelSortingResourceNames []corev1.ResourceName } // resourceModels records the number of each allocatable resource models. @@ -52,18 +52,15 @@ type ClusterResourceNode struct { // It maybe contain cpu, memory, gpu... // User can specify which parameters need to be included before the cluster starts // +required - resourceList ResourceList + resourceList corev1.ResourceList } -// ResourceList is a set of (resource name, quantity) pairs. -type ResourceList map[clusterapis.ResourceName]resource.Quantity - // InitSummary is the init function of modeling data structure func InitSummary(resourceModel []clusterapis.ResourceModel) (ResourceSummary, error) { - var rsName []clusterapis.ResourceName - var rsList []ResourceList + var rsName []corev1.ResourceName + var rsList []corev1.ResourceList for _, rm := range resourceModel { - tmp := map[clusterapis.ResourceName]resource.Quantity{} + tmp := map[corev1.ResourceName]resource.Quantity{} for _, rmItem := range rm.Ranges { if len(rsName) != len(rm.Ranges) { rsName = append(rsName, rmItem.Name) @@ -92,7 +89,7 @@ func InitSummary(resourceModel []clusterapis.ResourceModel) (ResourceSummary, er func NewClusterResourceNode(resourceList corev1.ResourceList) ClusterResourceNode { return ClusterResourceNode{ quantity: 1, - resourceList: ConvertToResourceList(resourceList), + resourceList: resourceList, } } @@ -218,23 +215,6 @@ func (rs *ResourceSummary) llConvertToRbt(list *list.List) *rbt.Tree { return root } -// ConvertToResourceList is convert from corev1.ResourceList to ResourceList -func ConvertToResourceList(rsList corev1.ResourceList) ResourceList { - resourceList := ResourceList{} - for name, quantity := range rsList { - if name == corev1.ResourceCPU { - resourceList[clusterapis.ResourceCPU] = quantity - } else if name == corev1.ResourceMemory { - resourceList[clusterapis.ResourceMemory] = quantity - } else if name == corev1.ResourceStorage { - resourceList[clusterapis.ResourceStorage] = quantity - } else if name == corev1.ResourceEphemeralStorage { - resourceList[clusterapis.ResourceEphemeralStorage] = quantity - } - } - return resourceList -} - // GetNodeNumFromModel is for getting node number from the modeling func (rs *ResourceSummary) GetNodeNumFromModel(model *resourceModels) int { if model.linkedlist != nil && model.redblackTree == nil { diff --git a/pkg/modeling/modeling_test.go b/pkg/modeling/modeling_test.go index e88d2a1c16e4..29bece46dfe3 100644 --- a/pkg/modeling/modeling_test.go +++ b/pkg/modeling/modeling_test.go @@ -19,12 +19,12 @@ func TestInitSummary(t *testing.T) { Grade: 0, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1024, resource.DecimalSI), }, @@ -34,12 +34,12 @@ func TestInitSummary(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(1024, resource.DecimalSI), Max: *resource.NewQuantity(1024*2, resource.DecimalSI), }, @@ -63,12 +63,12 @@ func TestInitSummaryError(t *testing.T) { Grade: 0, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1024, resource.DecimalSI), }, @@ -78,7 +78,7 @@ func TestInitSummaryError(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, @@ -102,12 +102,12 @@ func TestInitSummaryWithOneGrade(t *testing.T) { Grade: 0, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1024, resource.DecimalSI), }, @@ -168,12 +168,12 @@ func TestGetIndex(t *testing.T) { Grade: 0, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1024, resource.DecimalSI), }, @@ -183,12 +183,12 @@ func TestGetIndex(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(1024, resource.DecimalSI), Max: *resource.NewQuantity(1024*2, resource.DecimalSI), }, @@ -203,9 +203,9 @@ func TestGetIndex(t *testing.T) { crn := ClusterResourceNode{ quantity: 1, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024, resource.DecimalSI), }, } index := rs.getIndex(crn) @@ -216,9 +216,9 @@ func TestGetIndex(t *testing.T) { crn = ClusterResourceNode{ quantity: 1, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(20, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024*100, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(20, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024*100, resource.DecimalSI), }, } index = rs.getIndex(crn) @@ -234,12 +234,12 @@ func TestClusterResourceNodeComparator(t *testing.T) { Grade: 0, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1024, resource.DecimalSI), }, @@ -249,12 +249,12 @@ func TestClusterResourceNodeComparator(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(1024, resource.DecimalSI), Max: *resource.NewQuantity(1024*2, resource.DecimalSI), }, @@ -269,17 +269,17 @@ func TestClusterResourceNodeComparator(t *testing.T) { crn1 := ClusterResourceNode{ quantity: 10, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(10, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(10, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024, resource.DecimalSI), }, } crn2 := ClusterResourceNode{ quantity: 789, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(2, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(2, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024, resource.DecimalSI), }, } if res := rs.clusterResourceNodeComparator(crn1, crn2); res != 1 { @@ -288,17 +288,17 @@ func TestClusterResourceNodeComparator(t *testing.T) { crn1 = ClusterResourceNode{ quantity: 10, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(6, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(6, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024, resource.DecimalSI), }, } crn2 = ClusterResourceNode{ quantity: 789, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(6, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(6, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024, resource.DecimalSI), }, } if res := rs.clusterResourceNodeComparator(crn1, crn2); res != 0 { @@ -307,17 +307,17 @@ func TestClusterResourceNodeComparator(t *testing.T) { crn1 = ClusterResourceNode{ quantity: 10, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(6, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(6, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024, resource.DecimalSI), }, } crn2 = ClusterResourceNode{ quantity: 789, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(6, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024*10, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(6, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024*10, resource.DecimalSI), }, } if res := rs.clusterResourceNodeComparator(crn1, crn2); res != -1 { @@ -331,12 +331,12 @@ func TestGetNodeNumFromModel(t *testing.T) { Grade: 0, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1024, resource.DecimalSI), }, @@ -346,12 +346,12 @@ func TestGetNodeNumFromModel(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(1024, resource.DecimalSI), Max: *resource.NewQuantity(1024*2, resource.DecimalSI), }, @@ -370,25 +370,25 @@ func TestGetNodeNumFromModel(t *testing.T) { crn1 := ClusterResourceNode{ quantity: 3, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(8, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024*3, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(8, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024*3, resource.DecimalSI), }, } crn2 := ClusterResourceNode{ quantity: 1, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024*6, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024*6, resource.DecimalSI), }, } crn3 := ClusterResourceNode{ quantity: 2, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024*6, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024*6, resource.DecimalSI), }, } @@ -412,11 +412,10 @@ func TestGetNodeNumFromModel(t *testing.T) { } func TestConvertToResourceList(t *testing.T) { - rslist := corev1.ResourceList{ + rsl := corev1.ResourceList{ corev1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), corev1.ResourceMemory: *resource.NewQuantity(1024*6, resource.DecimalSI), } - rsl := ConvertToResourceList(rslist) for name := range rsl { if reflect.TypeOf(name).String() != "v1alpha1.ResourceName" { t.Errorf("Got %v expected %v", reflect.TypeOf(name), "v1alpha1.ResourceName") @@ -430,12 +429,12 @@ func TestLlConvertToRbt(t *testing.T) { Grade: 0, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1024, resource.DecimalSI), }, @@ -445,12 +444,12 @@ func TestLlConvertToRbt(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(1024, resource.DecimalSI), Max: *resource.NewQuantity(1024*2, resource.DecimalSI), }, @@ -465,49 +464,49 @@ func TestLlConvertToRbt(t *testing.T) { crn1 := ClusterResourceNode{ quantity: 6, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(2, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024*7, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(2, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024*7, resource.DecimalSI), }, } crn2 := ClusterResourceNode{ quantity: 5, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(6, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024*3, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(6, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024*3, resource.DecimalSI), }, } crn3 := ClusterResourceNode{ quantity: 4, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(5, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024*8, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(5, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024*8, resource.DecimalSI), }, } crn4 := ClusterResourceNode{ quantity: 3, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(8, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024*3, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(8, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024*3, resource.DecimalSI), }, } crn5 := ClusterResourceNode{ quantity: 2, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024*6, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024*6, resource.DecimalSI), }, } crn6 := ClusterResourceNode{ quantity: 1, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(2, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024*12, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(2, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024*12, resource.DecimalSI), }, } mylist := list.New() @@ -549,12 +548,12 @@ func TestRbtConvertToLl(t *testing.T) { Grade: 0, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1024, resource.DecimalSI), }, @@ -564,12 +563,12 @@ func TestRbtConvertToLl(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(1024, resource.DecimalSI), Max: *resource.NewQuantity(1024*2, resource.DecimalSI), }, @@ -599,12 +598,12 @@ func TestAddToResourceSummary(t *testing.T) { Grade: 0, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(1024, resource.DecimalSI), }, @@ -614,12 +613,12 @@ func TestAddToResourceSummary(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewMilliQuantity(1, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, { - Name: clusterapis.ResourceMemory, + Name: corev1.ResourceMemory, Min: *resource.NewMilliQuantity(1024, resource.DecimalSI), Max: *resource.NewQuantity(1024*2, resource.DecimalSI), }, @@ -638,25 +637,25 @@ func TestAddToResourceSummary(t *testing.T) { crn1 := ClusterResourceNode{ quantity: 3, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(8, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024*3, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(8, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024*3, resource.DecimalSI), }, } crn2 := ClusterResourceNode{ quantity: 1, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024*6, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024*6, resource.DecimalSI), }, } crn3 := ClusterResourceNode{ quantity: 2, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(1024*6, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(1024*6, resource.DecimalSI), }, } @@ -682,9 +681,9 @@ func TestAddToResourceSummary(t *testing.T) { crn4 := ClusterResourceNode{ quantity: 2, - resourceList: ResourceList{ - clusterapis.ResourceCPU: *resource.NewMilliQuantity(0, resource.DecimalSI), - clusterapis.ResourceMemory: *resource.NewQuantity(19, resource.DecimalSI), + resourceList: corev1.ResourceList{ + corev1.ResourceCPU: *resource.NewMilliQuantity(0, resource.DecimalSI), + corev1.ResourceMemory: *resource.NewQuantity(19, resource.DecimalSI), }, } diff --git a/pkg/registry/cluster/strategy_test.go b/pkg/registry/cluster/strategy_test.go index c5cf2f504668..bbdd42ad8b05 100644 --- a/pkg/registry/cluster/strategy_test.go +++ b/pkg/registry/cluster/strategy_test.go @@ -74,7 +74,7 @@ func TestStrategy_PrepareForCreate(t *testing.T) { Grade: 2, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(2, resource.DecimalSI), Max: *resource.NewQuantity(math.MaxInt64, resource.DecimalSI), }, @@ -84,7 +84,7 @@ func TestStrategy_PrepareForCreate(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, @@ -97,7 +97,7 @@ func TestStrategy_PrepareForCreate(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, @@ -107,7 +107,7 @@ func TestStrategy_PrepareForCreate(t *testing.T) { Grade: 2, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(2, resource.DecimalSI), Max: *resource.NewQuantity(math.MaxInt64, resource.DecimalSI), }, @@ -164,7 +164,7 @@ func TestStrategy_PrepareForUpdate(t *testing.T) { Grade: 2, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(2, resource.DecimalSI), Max: *resource.NewQuantity(math.MaxInt64, resource.DecimalSI), }, @@ -174,7 +174,7 @@ func TestStrategy_PrepareForUpdate(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, @@ -187,7 +187,7 @@ func TestStrategy_PrepareForUpdate(t *testing.T) { Grade: 1, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(0, resource.DecimalSI), Max: *resource.NewQuantity(2, resource.DecimalSI), }, @@ -197,7 +197,7 @@ func TestStrategy_PrepareForUpdate(t *testing.T) { Grade: 2, Ranges: []clusterapis.ResourceModelRange{ { - Name: clusterapis.ResourceCPU, + Name: corev1.ResourceCPU, Min: *resource.NewQuantity(2, resource.DecimalSI), Max: *resource.NewQuantity(math.MaxInt64, resource.DecimalSI), },