Merge pull request #48595 from bonowang/master

Automatic merge from submit-queue (batch tested with PRs 48997, 48595, 48898, 48711, 48972) remove useless code in podautoscaler **What this PR does / why we need it**: code optimization,remove some useless code. **Special notes for your reviewer:** My first Kubernetes PR，please let me know if anything wrong on this one. **Release note**: ```release-note NONE ```

Merge pull request #48595 from bonowang/master
e7dff4fd · Kubernetes Submit Queue · GitHub · aed912bf · bbb0365d · e7dff4fd
Commit e7dff4fd authored Jul 17, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

replica_calculator.go pkg/controller/podautoscaler/replica_calculator.go +0 -3

No files found.
--- a/pkg/controller/podautoscaler/replica_calculator.go
+++ b/pkg/controller/podautoscaler/replica_calculator.go
@@ -250,9 +250,6 @@ func (c *ReplicaCalculator) calcPlainMetricReplicas(metrics metricsclient.PodMet

 	// re-run the utilization calculation with our new numbers
 	newUsageRatio, _ := metricsclient.GetMetricUtilizationRatio(metrics, targetUtilization)
-	if err != nil {
-		return 0, utilization, err
-	}

 	if math.Abs(1.0-newUsageRatio) <= tolerance || (usageRatio < 1.0 && newUsageRatio > 1.0) || (usageRatio > 1.0 && newUsageRatio < 1.0) {
 		// return the current replicas if the change would be too small,