Add provreqOrchestrator that handle ProvReq classes

cluster-autoscaler/core/scaleup/orchestrator/wrapper_orchestrator.go

@@ -17,8 +17,6 @@ limitations under the License.
 package orchestrator
 
 import (
-	"fmt"
-
 	appsv1 "k8s.io/api/apps/v1"
 	apiv1 "k8s.io/api/core/v1"
 	"k8s.io/autoscaler/cluster-autoscaler/clusterstate"
@@ -28,10 +26,8 @@ import (
 	ca_processors "k8s.io/autoscaler/cluster-autoscaler/processors"
 	"k8s.io/autoscaler/cluster-autoscaler/processors/provreq"
 	"k8s.io/autoscaler/cluster-autoscaler/processors/status"
-	"k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/checkcapacity"
 	"k8s.io/autoscaler/cluster-autoscaler/utils/errors"
 	"k8s.io/autoscaler/cluster-autoscaler/utils/taints"
-	"k8s.io/client-go/rest"
 	schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework"
 )
 
@@ -41,20 +37,16 @@ import (
 type WrapperOrchestrator struct {
 	// scaleUpRegularPods indicates that ScaleUp for regular pods will be run in the current CA loop, if they are present.
 	scaleUpRegularPods  bool
-	scaleUpOrchestrator scaleup.Orchestrator
+	podsOrchestrator    scaleup.Orchestrator
 	provReqOrchestrator scaleup.Orchestrator
 }
 
 // NewWrapperOrchestrator return WrapperOrchestrator
-func NewWrapperOrchestrator(kubeConfig *rest.Config) (scaleup.Orchestrator, error) {
-	provReqOrchestrator, err := checkcapacity.New(kubeConfig)
-	if err != nil {
-		return nil, fmt.Errorf("failed create ScaleUp orchestrator for ProvisioningRequests, error: %v", err)
-	}
+func NewWrapperOrchestrator(provReqOrchestrator scaleup.Orchestrator) *WrapperOrchestrator {
 	return &WrapperOrchestrator{
-		scaleUpOrchestrator: New(),
+		podsOrchestrator:    New(),
 		provReqOrchestrator: provReqOrchestrator,
-	}, nil
+	}
 }
 
 // Initialize initializes the orchestrator object with required fields.
@@ -65,7 +57,7 @@ func (o *WrapperOrchestrator) Initialize(
 	estimatorBuilder estimator.EstimatorBuilder,
 	taintConfig taints.TaintConfig,
 ) {
-	o.scaleUpOrchestrator.Initialize(autoscalingContext, processors, clusterStateRegistry, estimatorBuilder, taintConfig)
+	o.podsOrchestrator.Initialize(autoscalingContext, processors, clusterStateRegistry, estimatorBuilder, taintConfig)
 	o.provReqOrchestrator.Initialize(autoscalingContext, processors, clusterStateRegistry, estimatorBuilder, taintConfig)
 }
 
@@ -86,7 +78,7 @@ func (o *WrapperOrchestrator) ScaleUp(
 	}
 
 	if o.scaleUpRegularPods {
-		return o.scaleUpOrchestrator.ScaleUp(regularPods, nodes, daemonSets, nodeInfos)
+		return o.podsOrchestrator.ScaleUp(regularPods, nodes, daemonSets, nodeInfos)
 	}
 	return o.provReqOrchestrator.ScaleUp(provReqPods, nodes, daemonSets, nodeInfos)
 }
@@ -110,5 +102,5 @@ func (o *WrapperOrchestrator) ScaleUpToNodeGroupMinSize(
 	nodes []*apiv1.Node,
 	nodeInfos map[string]*schedulerframework.NodeInfo,
 ) (*status.ScaleUpStatus, errors.AutoscalerError) {
-	return o.scaleUpOrchestrator.ScaleUpToNodeGroupMinSize(nodes, nodeInfos)
+	return o.podsOrchestrator.ScaleUpToNodeGroupMinSize(nodes, nodeInfos)
 }

cluster-autoscaler/core/scaleup/orchestrator/wrapper_orchestrator_test.go

@@ -42,7 +42,7 @@ const (
 func TestScaleUp(t *testing.T) {
 	o := WrapperOrchestrator{
 		provReqOrchestrator: &fakeScaleUp{provisioningRequestErrorMsg},
-		scaleUpOrchestrator: &fakeScaleUp{regularPodsErrorMsg},
+		podsOrchestrator:    &fakeScaleUp{regularPodsErrorMsg},
 	}
 	regularPods := []*apiv1.Pod{
 		BuildTestPod("pod-1", 1, 100),

cluster-autoscaler/main.go

@@ -60,6 +60,7 @@ import (
 	"k8s.io/autoscaler/cluster-autoscaler/processors/scaledowncandidates"
 	"k8s.io/autoscaler/cluster-autoscaler/processors/scaledowncandidates/emptycandidates"
 	"k8s.io/autoscaler/cluster-autoscaler/processors/scaledowncandidates/previouscandidates"
+	provreqorchestrator "k8s.io/autoscaler/cluster-autoscaler/provisioningrequest/orchestrator"
 	"k8s.io/autoscaler/cluster-autoscaler/simulator/clustersnapshot"
 	"k8s.io/autoscaler/cluster-autoscaler/simulator/drainability/rules"
 	"k8s.io/autoscaler/cluster-autoscaler/simulator/options"
@@ -494,10 +495,12 @@ func buildAutoscaler(debuggingSnapshotter debuggingsnapshot.DebuggingSnapshotter
 		podListProcessor.AddProcessor(provreq.NewProvisioningRequestPodsFilter(provreq.NewDefautlEventManager()))
 
 		restConfig := kube_util.GetKubeConfig(autoscalingOptions.KubeClientOpts)
-		scaleUpOrchestrator, err := orchestrator.NewWrapperOrchestrator(restConfig)
+		provreqOrchestrator, err := provreqorchestrator.New(restConfig)
 		if err != nil {
 			return nil, err
 		}
+		scaleUpOrchestrator := orchestrator.NewWrapperOrchestrator(provreqOrchestrator)
+
 		opts.ScaleUpOrchestrator = scaleUpOrchestrator
 		provreqProcesor, err := provreq.NewCombinedProvReqProcessor(restConfig, []provreq.ProvisioningRequestProcessor{checkcapacity.NewCheckCapacityProcessor()})
 		if err != nil {

cluster-autoscaler/processors/provreq/provisioning_request_injector.go

@@ -42,7 +42,7 @@ var SupportedProvisioningClasses = []string{v1beta1.ProvisioningClassCheckCapaci
 
 // ProvisioningRequestPodsInjector creates in-memory pods from ProvisioningRequest and inject them to unscheduled pods list.
 type ProvisioningRequestPodsInjector struct {
-	client provisioningRequestClient
+	client provreqclient.ProvisioningRequestClient
 	clock  clock.PassiveClock
 }
 

cluster-autoscaler/processors/provreq/provisioning_request_processor.go

@@ -30,15 +30,10 @@ type ProvisioningRequestProcessor interface {
 	CleanUp()
 }
 
-type provisioningRequestClient interface {
-	ProvisioningRequests() ([]*provreqwrapper.ProvisioningRequest, error)
-	ProvisioningRequest(namespace, name string) (*provreqwrapper.ProvisioningRequest, error)
-}
-
 // CombinedProvReqProcessor is responsible for processing ProvisioningRequest for each ProvisioningClass
 // every CA loop and updating conditions for expired ProvisioningRequests.
 type CombinedProvReqProcessor struct {
-	client     provisioningRequestClient
+	client     provreqclient.ProvisioningRequestClient
 	processors []ProvisioningRequestProcessor
 }