Address comments

pkg/common/resource.go

@@ -19,14 +19,12 @@
 package common
 
 import (
-	"go.uber.org/zap"
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/resource"
-	"k8s.io/kubernetes/pkg/apis/core/v1/helper/qos"
-
 	"github.com/apache/yunikorn-k8shim/pkg/log"
 	siCommon "github.com/apache/yunikorn-scheduler-interface/lib/go/common"
 	"github.com/apache/yunikorn-scheduler-interface/lib/go/si"
+	"go.uber.org/zap"
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 )
 
 // resource builder is a helper struct to construct si resources
@@ -69,21 +67,6 @@ func GetPodResource(pod *v1.Pod) (resource *si.Resource) {
 		checkInitContainerRequest(pod, podResource)
 	}
 
-	// iterate the pod resources when resource is zero, remove it from the pod resource
-	for k, v := range podResource.Resources {
-		if v.Value == 0 {
-			delete(podResource.Resources, k)
-		}
-	}
-
-	// A QosBestEffort pod does not request any cpu/mem resources, just a single pod
-	// But with other resources requested, it is not the best effort pod
-	if qos.GetPodQOS(pod) == v1.PodQOSBestEffort && (len(podResource.Resources) == 1) {
-		return &si.Resource{
-			Resources: map[string]*si.Quantity{"pods": {Value: 1}},
-		}
-	}
-
 	// K8s pod EnableOverHead from:
 	// alpha: v1.16
 	// beta: v1.18

pkg/common/resource_test.go

@@ -325,8 +325,10 @@ func TestBestEffortPod(t *testing.T) {
 	resources[v1.ResourceCPU] = resource.MustParse("0")
 
 	res = GetPodResource(pod)
-	assert.Equal(t, len(res.Resources), 1)
+	assert.Equal(t, len(res.Resources), 3)
 	assert.Equal(t, res.Resources["pods"].GetValue(), int64(1))
+	assert.Equal(t, res.Resources[siCommon.CPU].GetValue(), int64(0))
+	assert.Equal(t, res.Resources[siCommon.Memory].GetValue(), int64(0))
 }
 
 func TestGPUOnlyResources(t *testing.T) {
@@ -363,8 +365,9 @@ func TestGPUOnlyResources(t *testing.T) {
 
 	c1Resources[v1.ResourceName("nvidia.com/gpu")] = resource.MustParse("0")
 	res = GetPodResource(pod)
-	assert.Equal(t, len(res.Resources), 1)
+	assert.Equal(t, len(res.Resources), 2)
 	assert.Equal(t, res.Resources["pods"].GetValue(), int64(1))
+	assert.Equal(t, res.Resources["nvidia.com/gpu"].GetValue(), int64(0))
 }
 
 func TestNodeResource(t *testing.T) {