api: Align APIs with CRDs to use integers instead of floats

Author: astefanutti

pkg/apis/controller/v1beta1/appwrapper.go

@@ -254,10 +254,10 @@ type AppWrapperStatus struct {
 	// Resources consumed
 
 	// The number of CPU consumed by all pods belonging to the AppWrapper.
-	TotalCPU int32 `json:"totalcpu,omitempty"`
+	TotalCPU int64 `json:"totalcpu,omitempty"`
 
 	// The amount of memory consumed by all pods belonging to the AppWrapper.
-	TotalMemory int32 `json:"totalmemory,omitempty"`
+	TotalMemory int64 `json:"totalmemory,omitempty"`
 
 	// The total number of GPUs consumed by all pods belonging to the AppWrapper.
 	TotalGPU int64 `json:"totalgpu,omitempty"`

pkg/apis/controller/v1beta1/queuejob.go

@@ -1,19 +1,4 @@
 /*
-Copyright 2018 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-/*
 Copyright 2019, 2021 The Multi-Cluster App Dispatcher Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+
 package v1beta1
 
 import (
@@ -43,7 +29,7 @@ type QueueJob struct {
 
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
-	// Specification of the desired behavior of a cron job, including the minAvailable
+	// Specification of the desired behavior of a cron job
 	Spec QueueJobSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`
 
 	// Current status of QueueJob

pkg/controller/clusterstate/api/histogram_info.go

@@ -13,71 +13,70 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+
 package api
 
 import (
-	"github.com/prometheus/client_golang/prometheus"
-	"math"
-
 	"k8s.io/klog/v2"
+
+	"github.com/prometheus/client_golang/prometheus"
 )
 
 const (
-	BucketCount = 20  //Must be > 0
-	tolerance = 0.1
+	BucketCount = 20 // Must be > 0
 )
+
 type ResourceHistogram struct {
 	MilliCPU *prometheus.Histogram
 	Memory   *prometheus.Histogram
 	GPU      *prometheus.Histogram
 }
 
 func NewResourceHistogram(min *Resource, max *Resource) *ResourceHistogram {
-
 	start := max.MilliCPU
 	width := 1.0
 	count := 2
-	diff := math.Abs(min.MilliCPU - max.MilliCPU)
-	if diff >= tolerance {
+	diff := max.MilliCPU - min.MilliCPU
+	if diff > 0 {
 		start = min.MilliCPU
-		width = (diff/(BucketCount - 1))
+		width = float64(diff) / (BucketCount - 1)
 		count = BucketCount + 1
 	}
 	klog.V(10).Infof("[NewResourceHistogram] Start histogram numbers for CPU: start=%f, width=%f, count=%d",
 		start, width, count)
 	millicpuHist := prometheus.NewHistogram(prometheus.HistogramOpts{
-		Name: "millicpu",
-		Buckets: prometheus.LinearBuckets(start, width, count),})
+		Name:    "millicpu",
+		Buckets: prometheus.LinearBuckets(float64(start), width, count)})
 
 	start = max.Memory
 	width = 1.0
 	count = 2
-	diff = math.Abs(min.Memory - max.Memory)
-	if diff >= tolerance {
+	diff = max.Memory - min.Memory
+	if diff > 0 {
 		start = min.Memory
-		width = (diff/(BucketCount - 1))
+		width = float64(diff) / (BucketCount - 1)
 		count = BucketCount + 1
 	}
 	klog.V(10).Infof("[NewResourceHistogram] Start histogram numbers for Memory: start=%f, width=%f, count=%d",
 		start, width, count)
 	memoryHist := prometheus.NewHistogram(prometheus.HistogramOpts{
-		Name: "memory",
-		Buckets: prometheus.LinearBuckets(start, width, count),})
+		Name:    "memory",
+		Buckets: prometheus.LinearBuckets(float64(start), width, count)})
 
-	start = float64(max.GPU)
+	start = max.GPU
 	width = 1.0
 	count = 2
-	diff = math.Abs(float64(min.GPU - max.GPU))
-	if diff >= tolerance {
-		start = float64(min.GPU)
-		width = (diff/(BucketCount - 1))
+	diff = max.GPU - min.GPU
+	if diff >= 0 {
+		start = min.GPU
+		width = float64(diff) / (BucketCount - 1)
 		count = BucketCount + 1
 	}
 	klog.V(10).Infof("[NewResourceHistogram] Start histogram numbers for GPU: start=%f, width=%f, count=%d",
 		start, width, count)
 	gpuHist := prometheus.NewHistogram(prometheus.HistogramOpts{
-		Name: "gpu",
-		Buckets: prometheus.LinearBuckets(start, width, count),})
+		Name:    "gpu",
+		Buckets: prometheus.LinearBuckets(float64(start), width, count)})
 
 	rh := &ResourceHistogram{
 		MilliCPU: &millicpuHist,
@@ -88,9 +87,7 @@ func NewResourceHistogram(min *Resource, max *Resource) *ResourceHistogram {
 }
 
 func (rh *ResourceHistogram) Observer(r *Resource) {
-	(*rh.MilliCPU).Observe(r.MilliCPU)
-	(*rh.Memory).Observe(r.Memory)
+	(*rh.MilliCPU).Observe(float64(r.MilliCPU))
+	(*rh.Memory).Observe(float64(r.Memory))
 	(*rh.GPU).Observe(float64(r.GPU))
 }
-
-

pkg/controller/clusterstate/api/resource_info.go

@@ -1,19 +1,4 @@
 /*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-/*
 Copyright 2019, 2021 The Multi-Cluster App Dispatcher Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,18 +13,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+
 package api
 
 import (
 	"fmt"
-	"math"
 
 	v1 "k8s.io/api/core/v1"
 )
 
 type Resource struct {
-	MilliCPU float64
-	Memory   float64
+	MilliCPU int64
+	Memory   int64
 	GPU      int64
 }
 
@@ -65,17 +50,17 @@ func (r *Resource) Clone() *Resource {
 	return clone
 }
 
-var minMilliCPU float64 = 10
-var minMemory float64 = 10 * 1024 * 1024
+var minMilliCPU int64 = 10
+var minMemory int64 = 10 * 1024 * 1024
 
 func NewResource(rl v1.ResourceList) *Resource {
 	r := EmptyResource()
 	for rName, rQuant := range rl {
 		switch rName {
 		case v1.ResourceCPU:
-			r.MilliCPU += float64(rQuant.MilliValue())
+			r.MilliCPU += rQuant.MilliValue()
 		case v1.ResourceMemory:
-			r.Memory += float64(rQuant.Value())
+			r.Memory += rQuant.Value()
 		case GPUResourceName:
 			q, _ := rQuant.AsInt64()
 			r.GPU += q
@@ -116,12 +101,12 @@ func (r *Resource) Replace(rr *Resource) *Resource {
 	return r
 }
 
-//Sub subtracts two Resource objects.
+// Sub subtracts two Resource objects.
 func (r *Resource) Sub(rr *Resource) (*Resource, error) {
 	return r.NonNegSub(rr)
 }
 
-//Sub subtracts two Resource objects and return zero for negative subtractions.
+// Sub subtracts two Resource objects and return zero for negative subtractions.
 func (r *Resource) NonNegSub(rr *Resource) (*Resource, error) {
 	// Check for negative calculation
 	var isNegative bool
@@ -164,24 +149,24 @@ func (r *Resource) Less(rr *Resource) bool {
 }
 
 func (r *Resource) LessEqual(rr *Resource) bool {
-	return (r.MilliCPU < rr.MilliCPU || math.Abs(rr.MilliCPU-r.MilliCPU) < 0.01) &&
-		(r.Memory < rr.Memory || math.Abs(rr.Memory-r.Memory) < 1) &&
-		(r.GPU <= rr.GPU)
+	return r.MilliCPU < rr.MilliCPU &&
+		r.Memory < rr.Memory &&
+		r.GPU <= rr.GPU
 }
 
 func (r *Resource) String() string {
-	return fmt.Sprintf("cpu %0.2f, memory %0.2f, GPU %d",
+	return fmt.Sprintf("cpu %d, memory %d, GPU %d",
 		r.MilliCPU, r.Memory, r.GPU)
 }
 
-func (r *Resource) Get(rn v1.ResourceName) (float64, error) {
+func (r *Resource) Get(rn v1.ResourceName) (int64, error) {
 	switch rn {
 	case v1.ResourceCPU:
 		return r.MilliCPU, nil
 	case v1.ResourceMemory:
 		return r.Memory, nil
 	case GPUResourceName:
-		return float64(r.GPU), nil
+		return r.GPU, nil
 	default:
 		err := fmt.Errorf("resource not supported %v", rn)
 		return 0.0, err

pkg/controller/metrics/adapter/provider/provider.go

@@ -1,19 +1,4 @@
 /*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-/*
 Copyright 2019, 2021 The Multi-Cluster App Dispatcher Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+
 package provider
 
 import (
@@ -37,7 +23,6 @@ import (
 	"time"
 
 	"github.com/emicklei/go-restful"
-	"k8s.io/klog/v2"
 
 	apierr "k8s.io/apimachinery/pkg/api/errors"
 	apimeta "k8s.io/apimachinery/pkg/api/meta"
@@ -47,12 +32,13 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/dynamic"
+	"k8s.io/klog/v2"
 	"k8s.io/metrics/pkg/apis/custom_metrics"
 	"k8s.io/metrics/pkg/apis/external_metrics"
 
-	clusterstatecache "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/controller/clusterstate/cache"
 	"github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider"
 	"github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider/helpers"
+	clusterstatecache "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/controller/clusterstate/cache"
 )
 
 // CustomMetricResource wraps provider.CustomMetricInfo in a struct which stores the Name and Namespace of the resource
@@ -157,7 +143,7 @@ func NewFakeProvider(client dynamic.Interface, mapper apimeta.RESTMapper, cluste
 // webService creates a restful.WebService with routes set up for receiving fake metrics
 // These writing routes have been set up to be identical to the format of routes which metrics are read from.
 // There are 3 metric types available: namespaced, root-scoped, and namespaces.
-// (Note: Namespaces, we're assuming, are themselves namespaced resources, but for consistency with how metrics are retreived they have a separate route)
+// (Note: Namespaces, we're assuming, are themselves namespaced resources, but for consistency with how metrics are retrieved they have a separate route)
 func (p *clusterMetricsProvider) webService() *restful.WebService {
 	klog.V(10).Infof("Entered webService()")
 	ws := new(restful.WebService)
@@ -360,7 +346,7 @@ func (p *clusterMetricsProvider) GetExternalMetric(namespace string, metricSelec
 	p.valuesLock.RLock()
 	defer p.valuesLock.RUnlock()
 
-	matchingMetrics := []external_metrics.ExternalMetricValue{}
+	var matchingMetrics []external_metrics.ExternalMetricValue
 	for _, metric := range p.externalMetrics {
 		klog.V(9).Infof("[GetExternalMetric] externalMetricsInfo: %s, externalMetricValue: %v, externalMetricLabels: %v ",
 			metric.info.Metric, metric.Value, metric.labels)
@@ -374,15 +360,15 @@ func (p *clusterMetricsProvider) GetExternalMetric(namespace string, metricSelec
 				klog.V(9).Infof("[GetExternalMetric] Cache resources: %v", resources)
 
 				klog.V(10).Infof("[GetExternalMetric] Setting memory metric Value: %f.", resources.Memory)
-				metricValue.Value = *resource.NewQuantity(int64(resources.Memory), resource.DecimalSI)
-				//metricValue.Value = *resource.NewQuantity(4500000000, resource.DecimalSI)
+				metricValue.Value = *resource.NewQuantity(resources.Memory, resource.DecimalSI)
+				// metricValue.Value = *resource.NewQuantity(4500000000, resource.DecimalSI)
 			} else if strings.Compare(labelVal, "cpu") == 0 {
 				// Set cpu Value
 				resources := p.cache2.GetUnallocatedResources()
 				klog.V(9).Infof("[GetExternalMetric] Cache resources: %f", resources)
 
 				klog.V(10).Infof("[GetExternalMetric] Setting cpu metric Value: %v.", resources.MilliCPU)
-				metricValue.Value = *resource.NewQuantity(int64(resources.MilliCPU), resource.DecimalSI)
+				metricValue.Value = *resource.NewQuantity(resources.MilliCPU, resource.DecimalSI)
 			} else if strings.Compare(labelVal, "gpu") == 0 {
 				// Set gpu Value
 				resources := p.cache2.GetUnallocatedResources()