github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 13:57:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #136753 from tallclair/qos-cleanup

Browse Source 
Use quantity.Sign() instead of quantity.Cmp(zeroQuantity)
This commit is contained in:
Kubernetes Prow Robot
2026-02-05 11:20:29 +05:30
committed by GitHub
parent cb58c79c76 e8b7c959c9
commit f1bed8121b
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/apis/core/v1/helper/qos/qos.go
View File

@@ -18,7 +18,6 @@ package qos
import (
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/util/sets"
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/kubernetes/pkg/apis/core"
@@ -43,10 +42,6 @@ func GetPodQOS(pod *v1.Pod) v1.PodQOSClass {
return ComputePodQOS(pod)
}
// zeroQuantity represents a resource.Quantity with value "0", used as a baseline
// for resource comparisons.
var zeroQuantity = resource.MustParse("0")
// processResourceList adds non-zero quantities for supported QoS compute resources
// quantities from newList to list.
func processResourceList(list, newList v1.ResourceList) {
@@ -54,7 +49,7 @@ func processResourceList(list, newList v1.ResourceList) {
if !isSupportedQoSComputeResource(name) {
continue
}
if quantity.Cmp(zeroQuantity) == 1 {
if quantity.Sign() == 1 {
delta := quantity.DeepCopy()
if _, exists := list[name]; !exists {
list[name] = delta
@@ -75,7 +70,7 @@ func getQOSResources(list v1.ResourceList) sets.Set[string] {
if !isSupportedQoSComputeResource(name) {
continue
}
if quantity.Cmp(zeroQuantity) == 1 {
if quantity.Sign() == 1 {
qosResources.Insert(string(name))
}
}
@@ -120,7 +115,7 @@ func ComputePodQOS(pod *v1.Pod) v1.PodQOSClass {
if !isSupportedQoSComputeResource(name) {
continue
}
if quantity.Cmp(zeroQuantity) == 1 {
if quantity.Sign() == 1 {
delta := quantity.DeepCopy()
if _, exists := requests[name]; !exists {
requests[name] = delta
@@ -136,7 +131,7 @@ func ComputePodQOS(pod *v1.Pod) v1.PodQOSClass {
if !isSupportedQoSComputeResource(name) {
continue
}
if quantity.Cmp(zeroQuantity) == 1 {
if quantity.Sign() == 1 {
qosLimitsFound.Insert(string(name))
delta := quantity.DeepCopy()
if _, exists := limits[name]; !exists {

9
staging/src/k8s.io/kubectl/pkg/util/qos/qos.go
View File

@@ -18,7 +18,6 @@ package qos
import (
core "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/util/sets"
)
@@ -37,10 +36,6 @@ func GetPodQOS(pod *core.Pod) core.PodQOSClass {
return ComputePodQOS(pod)
}
// zeroQuantity represents a resource.Quantity with value "0", used as a baseline
// for resource comparisons.
var zeroQuantity = resource.MustParse("0")
// processResourceList adds non-zero quantities for supported QoS compute resources
// quantities from newList to list.
func processResourceList(list, newList core.ResourceList) {
@@ -48,7 +43,7 @@ func processResourceList(list, newList core.ResourceList) {
if !isSupportedQoSComputeResource(name) {
continue
}
if quantity.Cmp(zeroQuantity) == 1 {
if quantity.Sign() == 1 {
delta := quantity.DeepCopy()
if _, exists := list[name]; !exists {
list[name] = delta
@@ -69,7 +64,7 @@ func getQOSResources(list core.ResourceList) sets.Set[string] {
if !isSupportedQoSComputeResource(name) {
continue
}
if quantity.Cmp(zeroQuantity) == 1 {
if quantity.Sign() == 1 {
qosResources.Insert(string(name))
}
}