diff --git a/cmd/kube-controller-manager/app/options/options.go b/cmd/kube-controller-manager/app/options/options.go index 08b162d6df0..1545d16fc46 100644 --- a/cmd/kube-controller-manager/app/options/options.go +++ b/cmd/kube-controller-manager/app/options/options.go @@ -93,7 +93,7 @@ func NewCMServer() *CMServer { LeaderElection: leaderelection.DefaultLeaderElectionConfiguration(), ControllerStartInterval: unversioned.Duration{Duration: 0 * time.Second}, EnableGarbageCollector: false, - ConcurrentGCSyncs: 5, + ConcurrentGCSyncs: 100, ClusterSigningCertFile: "/etc/kubernetes/ca/ca.pem", ClusterSigningKeyFile: "/etc/kubernetes/ca/ca.key", }, diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 69fd8a056d3..f061c263920 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -3131,7 +3131,22 @@ func DeleteRCAndWaitForGC(c *client.Client, ns, name string) error { } deleteRCTime := time.Now().Sub(startTime) Logf("Deleting RC %s took: %v", name, deleteRCTime) - err = waitForPodsInactive(ps, 10*time.Millisecond, 10*time.Minute) + var interval, timeout time.Duration + switch { + case rc.Spec.Replicas < 100: + interval = 10 * time.Millisecond + timeout = 10 * time.Minute + case rc.Spec.Replicas < 1000: + interval = 1 * time.Second + timeout = 10 * time.Minute + case rc.Spec.Replicas < 10000: + interval = 10 * time.Second + timeout = 10 * time.Minute + default: + interval = 10 * time.Second + timeout = 40 * time.Minute + } + err = waitForPodsInactive(ps, interval, timeout) if err != nil { return fmt.Errorf("error while waiting for pods to become inactive %s: %v", name, err) }