Skip to content

K
k3s
Unverified Commit b49e0b7f authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #67883 from krzysztof-jastrzebski/hpas

Automatic merge from submit-queue (batch tested with PRs 67938, 66719, 67883). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Remove incorrect glog error from Horizontal Pod Autoscaler Controller. **What this PR does / why we need it**: Pro removes incorrect glog error from Horizontal Pod Autoscaler Controller. **Release note:** ```release-note none ```
parents 256070ad dfd88dbd
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
pkg/controller/podautoscaler/replica_calculator.go
View file @ b49e0b7f
...@@ -21,7 +21,6 @@ import ( ...@@ -21,7 +21,6 @@ import (
"math" "math"
"time" "time"
"github.com/golang/glog"
autoscaling "k8s.io/api/autoscaling/v2beta2" autoscaling "k8s.io/api/autoscaling/v2beta2"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
...@@ -30,7 +29,6 @@ import ( ...@@ -30,7 +29,6 @@ import (
v1coreclient "k8s.io/client-go/kubernetes/typed/core/v1" v1coreclient "k8s.io/client-go/kubernetes/typed/core/v1"
podutil "k8s.io/kubernetes/pkg/api/v1/pod" podutil "k8s.io/kubernetes/pkg/api/v1/pod"
metricsclient "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" metricsclient "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics"
"runtime/debug"
) )
const ( const (
...@@ -347,7 +345,6 @@ func (c *ReplicaCalculator) GetExternalPerPodMetricReplicas(currentReplicas int3 ...@@ -347,7 +345,6 @@ func (c *ReplicaCalculator) GetExternalPerPodMetricReplicas(currentReplicas int3
func groupPods(pods []v1.Pod, metrics metricsclient.PodMetricsInfo, resource v1.ResourceName, cpuTaintAfterStart, delayOfInitialReadinessStatus time.Duration) (readyPodCount int, ignoredPods sets.String, missingPods sets.String) { func groupPods(pods []v1.Pod, metrics metricsclient.PodMetricsInfo, resource v1.ResourceName, cpuTaintAfterStart, delayOfInitialReadinessStatus time.Duration) (readyPodCount int, ignoredPods sets.String, missingPods sets.String) {
missingPods = sets.NewString() missingPods = sets.NewString()
ignoredPods = sets.NewString() ignoredPods = sets.NewString()
glog.Errorf("groupPods stack: %v", string(debug.Stack()))
for _, pod := range pods { for _, pod := range pods {
if pod.Status.Phase == v1.PodFailed { if pod.Status.Phase == v1.PodFailed {
continue continue
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment