UPSTREAM: <carry>: openshift: revert #113

This reverts commit b8ec486.
openshift · Oct 28, 2019 · 76894dc · 76894dc
1 parent 80710de
commit 76894dc
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 100 deletions.
diff --git a/cluster-autoscaler/main.go b/cluster-autoscaler/main.go
@@ -35,7 +35,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
 	cloudBuilder "k8s.io/autoscaler/cluster-autoscaler/cloudprovider/builder"
-	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider/openshiftmachineapi"
 	"k8s.io/autoscaler/cluster-autoscaler/config"
 	"k8s.io/autoscaler/cluster-autoscaler/core"
 	"k8s.io/autoscaler/cluster-autoscaler/estimator"
@@ -297,15 +296,6 @@ func buildAutoscaler() (core.Autoscaler, error) {
 			Comparator: nodegroupset.IsAzureNodeInfoSimilar}
 	}
 
-	if autoscalingOptions.CloudProviderName == openshiftmachineapi.ProviderName {
-		// We do this because of:
-		// - https://bugzilla.redhat.com/show_bug.cgi?id=1731011
-		// - https://bugzilla.redhat.com/show_bug.cgi?id=1733235
-		processors.NodeGroupSetProcessor = &nodegroupset.BalancingNodeGroupSetProcessor{
-			Comparator: nodegroupset.IsOpenShiftMachineApiNodeInfoSimilar}
-
-	}
-
 	opts := core.AutoscalerOptions{
 		AutoscalingOptions: autoscalingOptions,
 		KubeClient:         kubeClient,

diff --git a/cluster-autoscaler/processors/nodegroupset/openshiftmachineapi_compare_nodegroups.go b/cluster-autoscaler/processors/nodegroupset/openshiftmachineapi_compare_nodegroups.go