Convert types according to CRD fields

Author: astefanutti

config/crd/bases/mcad.ibm.com_appwrappers.yaml

@@ -787,16 +787,18 @@ spec:
               totalcpu:
                 description: The number of CPU consumed by all pods belonging to the
                   AppWrapper.
-                type: number
+                format: int32
+                type: integer
               totalgpu:
                 description: The total number of GPUs consumed by all pods belonging
                   to the AppWrapper.
-                format: int64
+                format: int32
                 type: integer
               totalmemory:
                 description: The amount of memory consumed by all pods belonging to
                   the AppWrapper.
-                type: number
+                format: int32
+                type: integer
             type: object
         required:
         - spec

deployment/mcad-controller/crds/mcad.ibm.com_appwrappers.yaml

@@ -787,16 +787,18 @@ spec:
               totalcpu:
                 description: The number of CPU consumed by all pods belonging to the
                   AppWrapper.
-                type: number
+                format: int32
+                type: integer
               totalgpu:
                 description: The total number of GPUs consumed by all pods belonging
                   to the AppWrapper.
-                format: int64
+                format: int32
                 type: integer
               totalmemory:
                 description: The amount of memory consumed by all pods belonging to
                   the AppWrapper.
-                type: number
+                format: int32
+                type: integer
             type: object
         required:
         - spec

pkg/apis/controller/v1beta1/appwrapper.go

@@ -212,13 +212,13 @@ type AppWrapperStatus struct {
 	// Resources consumed
 
 	// The number of CPU consumed by all pods belonging to the AppWrapper.
-	TotalCPU float64 `json:"totalcpu,omitempty"`
+	TotalCPU int32 `json:"totalcpu,omitempty"`
 
 	// The amount of memory consumed by all pods belonging to the AppWrapper.
-	TotalMemory float64 `json:"totalmemory,omitempty"`
+	TotalMemory int32 `json:"totalmemory,omitempty"`
 
 	// The total number of GPUs consumed by all pods belonging to the AppWrapper.
-	TotalGPU int64 `json:"totalgpu,omitempty"`
+	TotalGPU int32 `json:"totalgpu,omitempty"`
 
 	// Field to keep track of total number of seconds spent in requeueing
 	RequeueingTimeInSeconds int `json:"requeueingTimeInSeconds,omitempty"`

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,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 api
 
 import (
@@ -116,12 +102,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

pkg/controller/queuejob/queuejob_controller_ex.go

@@ -702,12 +702,11 @@ func (qjm *XController) getDispatchedAppWrappers() (map[string]*clusterstateapi.
 	return awrRetVal, awsRetVal
 }
 
-func (qjm *XController) addTotalSnapshotResourcesConsumedByAw(totalgpu int64, totalcpu float64, totalmemory float64) *clusterstateapi.Resource {
-
+func (qjm *XController) addTotalSnapshotResourcesConsumedByAw(totalgpu int32, totalcpu int32, totalmemory int32) *clusterstateapi.Resource {
 	totalResource := clusterstateapi.EmptyResource()
-	totalResource.GPU = totalgpu
-	totalResource.MilliCPU = totalcpu
-	totalResource.Memory = totalmemory
+	totalResource.GPU = int64(totalgpu)
+	totalResource.MilliCPU = float64(totalcpu)
+	totalResource.Memory = float64(totalmemory)
 
 	return totalResource
 

pkg/controller/queuejobresources/pod/pod.go

@@ -214,9 +214,9 @@ func (qjrPod *QueueJobResPod) UpdateQueueJobStatus(queuejob *arbv1.AppWrapper) e
 	queuejob.Status.Succeeded = succeeded
 	queuejob.Status.Failed = failed
 	// Total resources by all running pods
-	queuejob.Status.TotalGPU = totalResourcesConsumedForPodPhases.GPU
-	queuejob.Status.TotalCPU = totalResourcesConsumedForPodPhases.MilliCPU
-	queuejob.Status.TotalMemory = totalResourcesConsumedForPodPhases.Memory
+	queuejob.Status.TotalGPU = int32(totalResourcesConsumedForPodPhases.GPU)
+	queuejob.Status.TotalCPU = int32(totalResourcesConsumedForPodPhases.MilliCPU)
+	queuejob.Status.TotalMemory = int32(totalResourcesConsumedForPodPhases.Memory)
 
 	queuejob.Status.PendingPodConditions = nil
 	for podName, cond := range podsConditionMap {