Sok3t/descheduler
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-26 13:29:11 +01:00
Code Packages Releases Activity

Fix compilation errors.

Browse Source
This commit is contained in:
Avesh Agarwal
2017-08-04 15:57:50 -04:00
parent 0f8ce97527
commit 1462cefa22
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/rescheduler/resheduler.go
View File

@@ -27,6 +27,7 @@ import (
"github.com/aveshagarwal/rescheduler/pkg/api/v1alpha1"
"github.com/aveshagarwal/rescheduler/pkg/rescheduler/client"
eutils "github.com/aveshagarwal/rescheduler/pkg/rescheduler/evictions/utils"
nodeutil "github.com/aveshagarwal/rescheduler/pkg/rescheduler/node"
"github.com/aveshagarwal/rescheduler/pkg/rescheduler/strategies"
)
@@ -61,7 +62,7 @@ func Run(rs *options.ReschedulerServer) error {
}
stopChannel := make(chan struct{})
nodes, err := nodeutil.ReadyNodes(client, stopChannel)
nodes, err := nodeutil.ReadyNodes(rs.Client, stopChannel)
if err != nil {
return err
}

1
pkg/rescheduler/strategies/duplicates.go
View File

@@ -24,7 +24,6 @@ import (
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"github.com/aveshagarwal/rescheduler/pkg/rescheduler/evictions"
"github.com/aveshagarwal/rescheduler/pkg/rescheduler/node"
podutil "github.com/aveshagarwal/rescheduler/pkg/rescheduler/pod"
)

19
pkg/rescheduler/strategies/lownodeutilization.go
View File

@@ -17,9 +17,12 @@ limitations under the License.
package strategies
import (
"fmt"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/api/v1/resource"
helper "k8s.io/kubernetes/pkg/api/v1/resource"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"github.com/aveshagarwal/rescheduler/pkg/api"
@@ -39,11 +42,11 @@ func NodeUtilization(client clientset.Interface, node *v1.Node) api.ResourceThre
}
totalReqs := map[v1.ResourceName]resource.Quantity{}
for pod := range pods {
for _, pod := range pods {
if podutil.IsBestEffortPod(pod) {
continue
}
req, _, err := resource.PodRequestsAndLimits(pod)
req, _, err := helper.PodRequestsAndLimits(pod)
if err != nil {
fmt.Printf("Error computing resource usage of pod, ignoring: %#v\n", pod.Name)
continue
@@ -66,11 +69,11 @@ func NodeUtilization(client clientset.Interface, node *v1.Node) api.ResourceThre
}
rt := api.ResourceThresholds{}
totalCPUReq := totalReq[v1.ResourceCPU]
totalMemReq := totalReq[v1.ResourceMemory]
totalCPUReq := totalReqs[v1.ResourceCPU]
totalMemReq := totalReqs[v1.ResourceMemory]
totalPods := len(pods)
rt[v1.ResourceCPU] = (float64(totalCPUReq.MilliValue()) * 100) / float64(allocatable.Cpu().MilliValue())
rt[v1.ResourceMmeory] = float64(totalMemReq.Value()) / float64(allocatable.Memory().Value()) * 100
rt[v1.ResourcePods] = (float64(totalPods) * 100) / float64(allocatable.Pods().Value())
rt[v1.ResourceCPU] = api.Percentage((float64(totalCPUReq.MilliValue()) * 100) / float64(allocatable.Cpu().MilliValue()))
rt[v1.ResourceMemory] = api.Percentage(float64(totalMemReq.Value()) / float64(allocatable.Memory().Value()) * 100)
rt[v1.ResourcePods] = api.Percentage((float64(totalPods) * 100) / float64(allocatable.Pods().Value()))
return rt
}