Enforce minimum resource granularity

Enforce minimum resource granularity of milli-{core, bytes} for Storage, Memory, and CPU resource types. For Storage and Memory, milli-bytes are allowed for backwards compatability, but the behavior is undefinied (depends on docker implementation).
2026-01-06 07:57:35 +00:00 · 2016-01-07 14:55:19 -08:00
parent 35e203b124
commit e50059de07
4 changed files with 117 additions and 159 deletions
--- a/pkg/api/v1/conversion_generated.go
+++ b/pkg/api/v1/conversion_generated.go
@@ -4203,65 +4203,20 @@ func autoConvert_v1_LimitRangeItem_To_api_LimitRangeItem(in *LimitRangeItem, out
 		defaulting.(func(*LimitRangeItem))(in)
 	}
 	out.Type = api.LimitType(in.Type)
-	if in.Max != nil {
-		out.Max = make(api.ResourceList)
-		for key, val := range in.Max {
-			newVal := resource.Quantity{}
-			if err := api.Convert_resource_Quantity_To_resource_Quantity(&val, &newVal, s); err != nil {
-				return err
-			}
-			out.Max[api.ResourceName(key)] = newVal
-		}
-	} else {
-		out.Max = nil
+	if err := s.Convert(&in.Max, &out.Max, 0); err != nil {
+		return err
 	}
-	if in.Min != nil {
-		out.Min = make(api.ResourceList)
-		for key, val := range in.Min {
-			newVal := resource.Quantity{}
-			if err := api.Convert_resource_Quantity_To_resource_Quantity(&val, &newVal, s); err != nil {
-				return err
-			}
-			out.Min[api.ResourceName(key)] = newVal
-		}
-	} else {
-		out.Min = nil
+	if err := s.Convert(&in.Min, &out.Min, 0); err != nil {
+		return err
 	}
-	if in.Default != nil {
-		out.Default = make(api.ResourceList)
-		for key, val := range in.Default {
-			newVal := resource.Quantity{}
-			if err := api.Convert_resource_Quantity_To_resource_Quantity(&val, &newVal, s); err != nil {
-				return err
-			}
-			out.Default[api.ResourceName(key)] = newVal
-		}
-	} else {
-		out.Default = nil
+	if err := s.Convert(&in.Default, &out.Default, 0); err != nil {
+		return err
 	}
-	if in.DefaultRequest != nil {
-		out.DefaultRequest = make(api.ResourceList)
-		for key, val := range in.DefaultRequest {
-			newVal := resource.Quantity{}
-			if err := api.Convert_resource_Quantity_To_resource_Quantity(&val, &newVal, s); err != nil {
-				return err
-			}
-			out.DefaultRequest[api.ResourceName(key)] = newVal
-		}
-	} else {
-		out.DefaultRequest = nil
+	if err := s.Convert(&in.DefaultRequest, &out.DefaultRequest, 0); err != nil {
+		return err
 	}
-	if in.MaxLimitRequestRatio != nil {
-		out.MaxLimitRequestRatio = make(api.ResourceList)
-		for key, val := range in.MaxLimitRequestRatio {
-			newVal := resource.Quantity{}
-			if err := api.Convert_resource_Quantity_To_resource_Quantity(&val, &newVal, s); err != nil {
-				return err
-			}
-			out.MaxLimitRequestRatio[api.ResourceName(key)] = newVal
-		}
-	} else {
-		out.MaxLimitRequestRatio = nil
+	if err := s.Convert(&in.MaxLimitRequestRatio, &out.MaxLimitRequestRatio, 0); err != nil {
+		return err
 	}
 	return nil
 }
@@ -4624,29 +4579,11 @@ func autoConvert_v1_NodeStatus_To_api_NodeStatus(in *NodeStatus, out *api.NodeSt
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*NodeStatus))(in)
 	}
-	if in.Capacity != nil {
-		out.Capacity = make(api.ResourceList)
-		for key, val := range in.Capacity {
-			newVal := resource.Quantity{}
-			if err := api.Convert_resource_Quantity_To_resource_Quantity(&val, &newVal, s); err != nil {
-				return err
-			}
-			out.Capacity[api.ResourceName(key)] = newVal
-		}
-	} else {
-		out.Capacity = nil
+	if err := s.Convert(&in.Capacity, &out.Capacity, 0); err != nil {
+		return err
 	}
-	if in.Allocatable != nil {
-		out.Allocatable = make(api.ResourceList)
-		for key, val := range in.Allocatable {
-			newVal := resource.Quantity{}
-			if err := api.Convert_resource_Quantity_To_resource_Quantity(&val, &newVal, s); err != nil {
-				return err
-			}
-			out.Allocatable[api.ResourceName(key)] = newVal
-		}
-	} else {
-		out.Allocatable = nil
+	if err := s.Convert(&in.Allocatable, &out.Allocatable, 0); err != nil {
+		return err
 	}
 	out.Phase = api.NodePhase(in.Phase)
 	if in.Conditions != nil {
@@ -4893,17 +4830,8 @@ func autoConvert_v1_PersistentVolumeClaimStatus_To_api_PersistentVolumeClaimStat
 	} else {
 		out.AccessModes = nil
 	}
-	if in.Capacity != nil {
-		out.Capacity = make(api.ResourceList)
-		for key, val := range in.Capacity {
-			newVal := resource.Quantity{}
-			if err := api.Convert_resource_Quantity_To_resource_Quantity(&val, &newVal, s); err != nil {
-				return err
-			}
-			out.Capacity[api.ResourceName(key)] = newVal
-		}
-	} else {
-		out.Capacity = nil
+	if err := s.Convert(&in.Capacity, &out.Capacity, 0); err != nil {
+		return err
 	}
 	return nil
 }
@@ -5075,17 +5003,8 @@ func autoConvert_v1_PersistentVolumeSpec_To_api_PersistentVolumeSpec(in *Persist
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*PersistentVolumeSpec))(in)
 	}
-	if in.Capacity != nil {
-		out.Capacity = make(api.ResourceList)
-		for key, val := range in.Capacity {
-			newVal := resource.Quantity{}
-			if err := api.Convert_resource_Quantity_To_resource_Quantity(&val, &newVal, s); err != nil {
-				return err
-			}
-			out.Capacity[api.ResourceName(key)] = newVal
-		}
-	} else {
-		out.Capacity = nil
+	if err := s.Convert(&in.Capacity, &out.Capacity, 0); err != nil {
+		return err
 	}
 	if err := Convert_v1_PersistentVolumeSource_To_api_PersistentVolumeSource(&in.PersistentVolumeSource, &out.PersistentVolumeSource, s); err != nil {
 		return err
@@ -5720,17 +5639,8 @@ func autoConvert_v1_ResourceQuotaSpec_To_api_ResourceQuotaSpec(in *ResourceQuota
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*ResourceQuotaSpec))(in)
 	}
-	if in.Hard != nil {
-		out.Hard = make(api.ResourceList)
-		for key, val := range in.Hard {
-			newVal := resource.Quantity{}
-			if err := api.Convert_resource_Quantity_To_resource_Quantity(&val, &newVal, s); err != nil {
-				return err
-			}
-			out.Hard[api.ResourceName(key)] = newVal
-		}
-	} else {
-		out.Hard = nil
+	if err := s.Convert(&in.Hard, &out.Hard, 0); err != nil {
+		return err
 	}
 	return nil
 }
@@ -5743,29 +5653,11 @@ func autoConvert_v1_ResourceQuotaStatus_To_api_ResourceQuotaStatus(in *ResourceQ
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*ResourceQuotaStatus))(in)
 	}
-	if in.Hard != nil {
-		out.Hard = make(api.ResourceList)
-		for key, val := range in.Hard {
-			newVal := resource.Quantity{}
-			if err := api.Convert_resource_Quantity_To_resource_Quantity(&val, &newVal, s); err != nil {
-				return err
-			}
-			out.Hard[api.ResourceName(key)] = newVal
-		}
-	} else {
-		out.Hard = nil
+	if err := s.Convert(&in.Hard, &out.Hard, 0); err != nil {
+		return err
 	}
-	if in.Used != nil {
-		out.Used = make(api.ResourceList)
-		for key, val := range in.Used {
-			newVal := resource.Quantity{}
-			if err := api.Convert_resource_Quantity_To_resource_Quantity(&val, &newVal, s); err != nil {
-				return err
-			}
-			out.Used[api.ResourceName(key)] = newVal
-		}
-	} else {
-		out.Used = nil
+	if err := s.Convert(&in.Used, &out.Used, 0); err != nil {
+		return err
 	}
 	return nil
 }
@@ -5778,29 +5670,11 @@ func autoConvert_v1_ResourceRequirements_To_api_ResourceRequirements(in *Resourc
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*ResourceRequirements))(in)
 	}
-	if in.Limits != nil {
-		out.Limits = make(api.ResourceList)
-		for key, val := range in.Limits {
-			newVal := resource.Quantity{}
-			if err := api.Convert_resource_Quantity_To_resource_Quantity(&val, &newVal, s); err != nil {
-				return err
-			}
-			out.Limits[api.ResourceName(key)] = newVal
-		}
-	} else {
-		out.Limits = nil
+	if err := s.Convert(&in.Limits, &out.Limits, 0); err != nil {
+		return err
 	}
-	if in.Requests != nil {
-		out.Requests = make(api.ResourceList)
-		for key, val := range in.Requests {
-			newVal := resource.Quantity{}
-			if err := api.Convert_resource_Quantity_To_resource_Quantity(&val, &newVal, s); err != nil {
-				return err
-			}
-			out.Requests[api.ResourceName(key)] = newVal
-		}
-	} else {
-		out.Requests = nil
+	if err := s.Convert(&in.Requests, &out.Requests, 0); err != nil {
+		return err
 	}
 	return nil
 }