Skip to content

Commit d018370

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#90059 from ahg-g/ahg-nodeinfo2
Cleanup obsolete NodeInfo methods
2 parents aed3f05 + d6522e0 commit d018370

File tree

29 files changed

+78
-229
lines changed

29 files changed

+78
-229
lines changed

‎pkg/controller/daemon/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ go_library(
2020
"//pkg/controller:go_default_library",
2121
"//pkg/controller/daemon/util:go_default_library",
2222
"//pkg/scheduler/framework/plugins/helper:go_default_library",
23-
"//pkg/scheduler/nodeinfo:go_default_library",
2423
"//pkg/util/labels:go_default_library",
2524
"//staging/src/k8s.io/api/apps/v1:go_default_library",
2625
"//staging/src/k8s.io/api/core/v1:go_default_library",

‎pkg/controller/daemon/daemon_controller.go‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ import (
5353
"k8s.io/kubernetes/pkg/controller"
5454
"k8s.io/kubernetes/pkg/controller/daemon/util"
5555
pluginhelper "k8s.io/kubernetes/pkg/scheduler/framework/plugins/helper"
56-
schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
5756
"k8s.io/utils/integer"
5857
)
5958

@@ -1200,14 +1199,7 @@ func (dsc *DaemonSetsController) nodeShouldRunDaemonPod(node *v1.Node, ds *apps.
12001199
return false, false, nil
12011200
}
12021201

1203-
nodeInfo := schedulernodeinfo.NewNodeInfo()
1204-
nodeInfo.SetNode(node)
1205-
taints, err := nodeInfo.Taints()
1206-
if err != nil {
1207-
klog.Warningf("failed to get node %q taints: %v", node.Name, err)
1208-
return false, false, err
1209-
}
1210-
1202+
taints := node.Spec.Taints
12111203
fitsNodeName, fitsNodeAffinity, fitsTaints := Predicates(pod, node, taints)
12121204
if !fitsNodeName || !fitsNodeAffinity {
12131205
return false, false, nil

‎pkg/kubelet/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ go_test(
213213
"//pkg/kubelet/util/queue:go_default_library",
214214
"//pkg/kubelet/util/sliceutils:go_default_library",
215215
"//pkg/kubelet/volumemanager:go_default_library",
216-
"//pkg/scheduler/nodeinfo:go_default_library",
216+
"//pkg/scheduler/framework/v1alpha1:go_default_library",
217217
"//pkg/util/taints:go_default_library",
218218
"//pkg/volume:go_default_library",
219219
"//pkg/volume/awsebs:go_default_library",

‎pkg/kubelet/cm/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ go_library(
3636
"//pkg/kubelet/lifecycle:go_default_library",
3737
"//pkg/kubelet/pluginmanager/cache:go_default_library",
3838
"//pkg/kubelet/status:go_default_library",
39-
"//pkg/scheduler/nodeinfo:go_default_library",
39+
"//pkg/scheduler/framework/v1alpha1:go_default_library",
4040
"//staging/src/k8s.io/api/core/v1:go_default_library",
4141
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
4242
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",

‎pkg/kubelet/cm/container_manager.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
3232
"k8s.io/kubernetes/pkg/kubelet/pluginmanager/cache"
3333
"k8s.io/kubernetes/pkg/kubelet/status"
34-
schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
34+
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
3535

3636
"fmt"
3737
"strconv"
@@ -91,7 +91,7 @@ type ContainerManager interface {
9191
// Otherwise, it updates allocatableResource in nodeInfo if necessary,
9292
// to make sure it is at least equal to the pod's requested capacity for
9393
// any registered device plugin resource
94-
UpdatePluginResources(*schedulernodeinfo.NodeInfo, *lifecycle.PodAdmitAttributes) error
94+
UpdatePluginResources(*schedulerframework.NodeInfo, *lifecycle.PodAdmitAttributes) error
9595

9696
InternalContainerLifecycle() InternalContainerLifecycle
9797

‎pkg/kubelet/cm/container_manager_linux.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ import (
6262
"k8s.io/kubernetes/pkg/kubelet/qos"
6363
"k8s.io/kubernetes/pkg/kubelet/stats/pidlimit"
6464
"k8s.io/kubernetes/pkg/kubelet/status"
65-
schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
65+
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
6666
"k8s.io/kubernetes/pkg/util/oom"
6767
"k8s.io/kubernetes/pkg/util/procfs"
6868
utilsysctl "k8s.io/kubernetes/pkg/util/sysctl"
@@ -675,7 +675,7 @@ func (cm *containerManagerImpl) GetResources(pod *v1.Pod, container *v1.Containe
675675
return opts, nil
676676
}
677677

678-
func (cm *containerManagerImpl) UpdatePluginResources(node *schedulernodeinfo.NodeInfo, attrs *lifecycle.PodAdmitAttributes) error {
678+
func (cm *containerManagerImpl) UpdatePluginResources(node *schedulerframework.NodeInfo, attrs *lifecycle.PodAdmitAttributes) error {
679679
return cm.deviceManager.UpdatePluginResources(node, attrs)
680680
}
681681

‎pkg/kubelet/cm/container_manager_stub.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
3131
"k8s.io/kubernetes/pkg/kubelet/pluginmanager/cache"
3232
"k8s.io/kubernetes/pkg/kubelet/status"
33-
schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
33+
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
3434
)
3535

3636
type containerManagerStub struct {
@@ -97,7 +97,7 @@ func (cm *containerManagerStub) GetResources(pod *v1.Pod, container *v1.Containe
9797
return &kubecontainer.RunContainerOptions{}, nil
9898
}
9999

100-
func (cm *containerManagerStub) UpdatePluginResources(*schedulernodeinfo.NodeInfo, *lifecycle.PodAdmitAttributes) error {
100+
func (cm *containerManagerStub) UpdatePluginResources(*schedulerframework.NodeInfo, *lifecycle.PodAdmitAttributes) error {
101101
return nil
102102
}
103103

‎pkg/kubelet/cm/container_manager_windows.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import (
4242
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
4343
"k8s.io/kubernetes/pkg/kubelet/pluginmanager/cache"
4444
"k8s.io/kubernetes/pkg/kubelet/status"
45-
schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
45+
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
4646
)
4747

4848
type containerManagerImpl struct {
@@ -165,7 +165,7 @@ func (cm *containerManagerImpl) GetResources(pod *v1.Pod, container *v1.Containe
165165
return &kubecontainer.RunContainerOptions{}, nil
166166
}
167167

168-
func (cm *containerManagerImpl) UpdatePluginResources(*schedulernodeinfo.NodeInfo, *lifecycle.PodAdmitAttributes) error {
168+
func (cm *containerManagerImpl) UpdatePluginResources(*schedulerframework.NodeInfo, *lifecycle.PodAdmitAttributes) error {
169169
return nil
170170
}
171171

‎pkg/kubelet/cm/devicemanager/BUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ go_library(
2828
"//pkg/kubelet/lifecycle:go_default_library",
2929
"//pkg/kubelet/metrics:go_default_library",
3030
"//pkg/kubelet/pluginmanager/cache:go_default_library",
31-
"//pkg/scheduler/nodeinfo:go_default_library",
31+
"//pkg/scheduler/framework/v1alpha1:go_default_library",
3232
"//pkg/util/selinux:go_default_library",
3333
"//staging/src/k8s.io/api/core/v1:go_default_library",
3434
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
@@ -57,7 +57,7 @@ go_test(
5757
"//pkg/kubelet/config:go_default_library",
5858
"//pkg/kubelet/lifecycle:go_default_library",
5959
"//pkg/kubelet/pluginmanager:go_default_library",
60-
"//pkg/scheduler/nodeinfo:go_default_library",
60+
"//pkg/scheduler/framework/v1alpha1:go_default_library",
6161
"//staging/src/k8s.io/api/core/v1:go_default_library",
6262
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
6363
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

‎pkg/kubelet/cm/devicemanager/manager.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import (
4848
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
4949
"k8s.io/kubernetes/pkg/kubelet/metrics"
5050
"k8s.io/kubernetes/pkg/kubelet/pluginmanager/cache"
51-
schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
51+
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
5252
"k8s.io/kubernetes/pkg/util/selinux"
5353
)
5454

@@ -391,7 +391,7 @@ func (m *ManagerImpl) Allocate(pod *v1.Pod, container *v1.Container) error {
391391
}
392392

393393
// UpdatePluginResources updates node resources based on devices already allocated to pods.
394-
func (m *ManagerImpl) UpdatePluginResources(node *schedulernodeinfo.NodeInfo, attrs *lifecycle.PodAdmitAttributes) error {
394+
func (m *ManagerImpl) UpdatePluginResources(node *schedulerframework.NodeInfo, attrs *lifecycle.PodAdmitAttributes) error {
395395
pod := attrs.Pod
396396

397397
m.mutex.Lock()
@@ -924,9 +924,9 @@ func (m *ManagerImpl) callPreStartContainerIfNeeded(podUID, contName, resource s
924924
// and if necessary, updates allocatableResource in nodeInfo to at least equal to
925925
// the allocated capacity. This allows pods that have already been scheduled on
926926
// the node to pass GeneralPredicates admission checking even upon device plugin failure.
927-
func (m *ManagerImpl) sanitizeNodeAllocatable(node *schedulernodeinfo.NodeInfo) {
928-
var newAllocatableResource *schedulernodeinfo.Resource
929-
allocatableResource := node.AllocatableResource()
927+
func (m *ManagerImpl) sanitizeNodeAllocatable(node *schedulerframework.NodeInfo) {
928+
var newAllocatableResource *schedulerframework.Resource
929+
allocatableResource := node.Allocatable
930930
if allocatableResource.ScalarResources == nil {
931931
allocatableResource.ScalarResources = make(map[v1.ResourceName]int64)
932932
}
@@ -944,7 +944,7 @@ func (m *ManagerImpl) sanitizeNodeAllocatable(node *schedulernodeinfo.NodeInfo)
944944
newAllocatableResource.ScalarResources[v1.ResourceName(resource)] = int64(needed)
945945
}
946946
if newAllocatableResource != nil {
947-
node.SetAllocatableResource(newAllocatableResource)
947+
node.Allocatable = newAllocatableResource
948948
}
949949
}
950950

0 commit comments

Comments
 (0)