Update scheduler cache package
This commit is contained in:
		
							parent
							
								
									66669f11d3
								
							
						
					
					
						commit
						be3dd85503
					
				|  | @ -25,7 +25,7 @@ import ( | |||
| 	"k8s.io/apimachinery/pkg/api/resource" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/utils/errors" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| ) | ||||
| 
 | ||||
| const ( | ||||
|  |  | |||
|  | @ -25,7 +25,7 @@ import ( | |||
| 	apiv1 "k8s.io/api/core/v1" | ||||
| 	"k8s.io/apimachinery/pkg/api/resource" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/utils/errors" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| ) | ||||
| 
 | ||||
| // CloudProvider contains configuration info and functions for interacting with
 | ||||
|  |  | |||
|  | @ -26,7 +26,7 @@ import ( | |||
| 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/utils/errors" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/utils/gpu" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| ) | ||||
| 
 | ||||
| // The 'GCE' cloud provider actually implements both the GCE and GKE providers.
 | ||||
|  |  | |||
|  | @ -30,7 +30,7 @@ import ( | |||
| 	"k8s.io/autoscaler/cluster-autoscaler/config/dynamic" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/utils/errors" | ||||
| 	"k8s.io/kubernetes/pkg/kubemark" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/golang/glog" | ||||
| ) | ||||
|  |  | |||
|  | @ -24,7 +24,7 @@ import ( | |||
| 	"k8s.io/apimachinery/pkg/api/resource" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/utils/errors" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| ) | ||||
| 
 | ||||
| // OnScaleUpFunc is a function called on node group increase in TestCloudProvider.
 | ||||
|  |  | |||
|  | @ -33,7 +33,7 @@ import ( | |||
| 	"k8s.io/autoscaler/cluster-autoscaler/utils/errors" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/utils/glogx" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/utils/nodegroupset" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/golang/glog" | ||||
| ) | ||||
|  |  | |||
|  | @ -44,7 +44,7 @@ import ( | |||
| 	"k8s.io/client-go/kubernetes/fake" | ||||
| 	core "k8s.io/client-go/testing" | ||||
| 	kube_record "k8s.io/client-go/tools/record" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/expander" | ||||
|  |  | |||
|  | @ -39,7 +39,7 @@ import ( | |||
| 	policyv1 "k8s.io/api/policy/v1beta1" | ||||
| 	"k8s.io/client-go/kubernetes/fake" | ||||
| 	kube_record "k8s.io/client-go/tools/record" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/golang/glog" | ||||
| 	"github.com/stretchr/testify/assert" | ||||
|  |  | |||
|  | @ -42,7 +42,7 @@ import ( | |||
| 	apiequality "k8s.io/apimachinery/pkg/api/equality" | ||||
| 	kube_client "k8s.io/client-go/kubernetes" | ||||
| 	kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/golang/glog" | ||||
| ) | ||||
|  |  | |||
|  | @ -41,7 +41,7 @@ import ( | |||
| 	kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" | ||||
| 
 | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| ) | ||||
| 
 | ||||
| func TestPodSchedulableMap(t *testing.T) { | ||||
|  |  | |||
|  | @ -22,7 +22,7 @@ import ( | |||
| 	apiv1 "k8s.io/api/core/v1" | ||||
| 	"k8s.io/apimachinery/pkg/api/resource" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/simulator" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| ) | ||||
| 
 | ||||
| // podInfo contains Pod and score that corresponds to how important it is to handle the pod first.
 | ||||
|  |  | |||
|  | @ -24,7 +24,7 @@ import ( | |||
| 	"k8s.io/apimachinery/pkg/api/resource" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/simulator" | ||||
| 	. "k8s.io/autoscaler/cluster-autoscaler/utils/test" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| ) | ||||
|  |  | |||
|  | @ -23,7 +23,7 @@ import ( | |||
| 
 | ||||
| 	apiv1 "k8s.io/api/core/v1" | ||||
| 	"k8s.io/apimachinery/pkg/api/resource" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| ) | ||||
| 
 | ||||
| const ( | ||||
|  |  | |||
|  | @ -21,7 +21,7 @@ import ( | |||
| 
 | ||||
| 	apiv1 "k8s.io/api/core/v1" | ||||
| 	"k8s.io/apimachinery/pkg/api/resource" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| ) | ||||
|  |  | |||
|  | @ -19,7 +19,7 @@ package expander | |||
| import ( | ||||
| 	apiv1 "k8s.io/api/core/v1" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| ) | ||||
| 
 | ||||
| var ( | ||||
|  |  | |||
|  | @ -19,7 +19,7 @@ package mostpods | |||
| import ( | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/expander" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/expander/random" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| ) | ||||
| 
 | ||||
| type mostpods struct { | ||||
|  |  | |||
|  | @ -27,7 +27,7 @@ import ( | |||
| 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/expander" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/utils/gpu" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/golang/glog" | ||||
| ) | ||||
|  |  | |||
|  | @ -26,7 +26,7 @@ import ( | |||
| 	apiv1 "k8s.io/api/core/v1" | ||||
| 	testprovider "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/test" | ||||
| 	. "k8s.io/autoscaler/cluster-autoscaler/utils/test" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| ) | ||||
|  |  | |||
|  | @ -20,7 +20,7 @@ import ( | |||
| 	"math/rand" | ||||
| 
 | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/expander" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| ) | ||||
| 
 | ||||
| type random struct { | ||||
|  |  | |||
|  | @ -22,7 +22,7 @@ import ( | |||
| 	"k8s.io/apimachinery/pkg/api/resource" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/expander" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/expander/random" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| ) | ||||
| 
 | ||||
| type leastwaste struct { | ||||
|  |  | |||
|  | @ -27,7 +27,7 @@ import ( | |||
| 	apiv1 "k8s.io/api/core/v1" | ||||
| 	"k8s.io/apimachinery/pkg/api/resource" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/expander" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| ) | ||||
| 
 | ||||
| type FakeNodeGroup struct { | ||||
|  |  | |||
|  | @ -23,7 +23,7 @@ import ( | |||
| 	"k8s.io/autoscaler/cluster-autoscaler/context" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/utils/gpu" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/utils/labels" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/golang/glog" | ||||
| ) | ||||
|  |  | |||
|  | @ -23,7 +23,7 @@ import ( | |||
| 	testprovider "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/test" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/context" | ||||
| 	. "k8s.io/autoscaler/cluster-autoscaler/utils/test" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| ) | ||||
|  |  | |||
|  | @ -20,7 +20,7 @@ import ( | |||
| 	apiv1 "k8s.io/api/core/v1" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/context" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| ) | ||||
| 
 | ||||
| // NodeGroupListProcessor processes lists of NodeGroups considered in scale-up.
 | ||||
|  |  | |||
|  | @ -33,7 +33,7 @@ import ( | |||
| 	"k8s.io/apimachinery/pkg/api/resource" | ||||
| 	client "k8s.io/client-go/kubernetes" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/algorithm" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/golang/glog" | ||||
| ) | ||||
|  |  | |||
|  | @ -25,7 +25,7 @@ import ( | |||
| 	policyv1 "k8s.io/api/policy/v1beta1" | ||||
| 	. "k8s.io/autoscaler/cluster-autoscaler/utils/test" | ||||
| 	"k8s.io/kubernetes/pkg/kubelet/types" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| ) | ||||
|  |  | |||
|  | @ -26,7 +26,7 @@ import ( | |||
| 	"k8s.io/apimachinery/pkg/labels" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/utils/drain" | ||||
| 	client "k8s.io/client-go/kubernetes" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| ) | ||||
| 
 | ||||
| // FastGetPodsToMove returns a list of pods that should be moved elsewhere if the node
 | ||||
|  |  | |||
|  | @ -25,7 +25,7 @@ import ( | |||
| 	"k8s.io/apimachinery/pkg/util/intstr" | ||||
| 	. "k8s.io/autoscaler/cluster-autoscaler/utils/test" | ||||
| 	"k8s.io/kubernetes/pkg/kubelet/types" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| ) | ||||
|  |  | |||
|  | @ -26,7 +26,7 @@ import ( | |||
| 	"k8s.io/autoscaler/cluster-autoscaler/utils/drain" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/utils/errors" | ||||
| 	kube_client "k8s.io/client-go/kubernetes" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| ) | ||||
| 
 | ||||
| // GetRequiredPodsForNode returns a list of pods that would appear on the node if the
 | ||||
|  |  | |||
|  | @ -27,8 +27,8 @@ import ( | |||
| 	kube_client "k8s.io/client-go/kubernetes" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/algorithm" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/algorithm/predicates" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/factory" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 
 | ||||
| 	// We need to import provider to initialize default scheduler.
 | ||||
| 	_ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider" | ||||
|  |  | |||
|  | @ -22,7 +22,7 @@ import ( | |||
| 	"time" | ||||
| 
 | ||||
| 	. "k8s.io/autoscaler/cluster-autoscaler/utils/test" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| ) | ||||
|  |  | |||
|  | @ -24,7 +24,7 @@ import ( | |||
| 
 | ||||
| 	apiv1 "k8s.io/api/core/v1" | ||||
| 	extensionsv1 "k8s.io/api/extensions/v1beta1" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| ) | ||||
| 
 | ||||
| // GetDaemonSetPodsForNode returns daemonset nodes for the given pod.
 | ||||
|  |  | |||
|  | @ -27,7 +27,7 @@ import ( | |||
| 	apiv1 "k8s.io/api/core/v1" | ||||
| 	extensionsv1 "k8s.io/api/extensions/v1beta1" | ||||
| 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| ) | ||||
|  |  | |||
|  | @ -22,7 +22,7 @@ import ( | |||
| 	apiv1 "k8s.io/api/core/v1" | ||||
| 	"k8s.io/apimachinery/pkg/api/resource" | ||||
| 	kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| ) | ||||
| 
 | ||||
| const ( | ||||
|  |  | |||
|  | @ -23,7 +23,7 @@ import ( | |||
| 	"k8s.io/apimachinery/pkg/api/resource" | ||||
| 	. "k8s.io/autoscaler/cluster-autoscaler/utils/test" | ||||
| 	kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| ) | ||||
|  |  | |||
|  | @ -19,7 +19,7 @@ package nodegroupset | |||
| import ( | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider" | ||||
| 	"k8s.io/autoscaler/cluster-autoscaler/utils/errors" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/golang/glog" | ||||
| ) | ||||
|  |  | |||
|  | @ -22,7 +22,7 @@ import ( | |||
| 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider" | ||||
| 	testprovider "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/test" | ||||
| 	. "k8s.io/autoscaler/cluster-autoscaler/utils/test" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| 
 | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| ) | ||||
|  |  | |||
|  | @ -18,7 +18,7 @@ package scheduler | |||
| 
 | ||||
| import ( | ||||
| 	apiv1 "k8s.io/api/core/v1" | ||||
| 	"k8s.io/kubernetes/pkg/scheduler/schedulercache" | ||||
| 	schedulercache "k8s.io/kubernetes/pkg/scheduler/cache" | ||||
| ) | ||||
| 
 | ||||
| const ( | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue