karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #418 from Garrybest/remove-hard-code 

modify hard code in cluster_status_controller
This commit is contained in:
karmada-bot 2021-06-05 10:43:44 +08:00 committed by GitHub
parent ff11128c69 0331f8c6df
commit fc22d2336e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controllers/status/cluster_status_controller.go
View File

@ -402,7 +402,7 @@ func convertObjectsToPods(podList []runtime.Object) ([]*corev1.Pod, error) {
func getReadyStatusForNode(nodeStatus corev1.NodeStatus) bool { func getReadyStatusForNode(nodeStatus corev1.NodeStatus) bool {
for _, condition := range nodeStatus.Conditions { for _, condition := range nodeStatus.Conditions {
if condition.Type == "Ready" { if condition.Type == corev1.NodeReady {
if condition.Status == corev1.ConditionTrue { if condition.Status == corev1.ConditionTrue {
return true return true
} }
@ -431,9 +431,9 @@ func getClusterAllocatable(nodeList []*corev1.Node) (allocatable corev1.Resource
func getUsedResource(podList []*corev1.Pod) corev1.ResourceList { func getUsedResource(podList []*corev1.Pod) corev1.ResourceList {
var requestCPU, requestMem int64 var requestCPU, requestMem int64
for _, pod := range podList { for _, pod := range podList {
if pod.Status.Phase == "Running" { if pod.Status.Phase == corev1.PodRunning {
for _, c := range pod.Status.Conditions { for _, c := range pod.Status.Conditions {
if c.Type == "Ready" && c.Status == "True" { if c.Type == corev1.PodReady && c.Status == corev1.ConditionTrue {
podRes := addPodRequestResource(pod) podRes := addPodRequestResource(pod)
requestCPU += podRes.MilliCPU requestCPU += podRes.MilliCPU
requestMem += podRes.Memory requestMem += podRes.Memory