Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

autoscaler
- Activity
- Members
- Terraform modules
- Model experiments

Snippets Groups Projects

4bc337ca

Unverified Commit 4bc337ca authored Nov 6, 2019 by Kubernetes Prow Robot Committed by GitHub Nov 6, 2019

Downloads
- Plain Diff

Merge pull request #2509 from marwanad/cherry-pick-1963-to-1.13

Cherry pick #1963 to 1.13: add --ignore-taint flag and ignore taints added by TaintNodesByCondition

parents cac7ecfe 37b97322

Branches

No related tags found

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

cluster-autoscaler/config/autoscaling_options.go 2 additions, 0 deletions

cluster-autoscaler/config/autoscaling_options.go
cluster-autoscaler/core/scale_up.go 3 additions, 3 deletions

cluster-autoscaler/core/scale_up.go
cluster-autoscaler/core/scale_up_test.go 17 additions, 14 deletions

cluster-autoscaler/core/scale_up_test.go
cluster-autoscaler/core/static_autoscaler.go 11 additions, 2 deletions

cluster-autoscaler/core/static_autoscaler.go
cluster-autoscaler/core/utils.go 40 additions, 10 deletions

cluster-autoscaler/core/utils.go
cluster-autoscaler/core/utils_test.go 22 additions, 9 deletions

cluster-autoscaler/core/utils_test.go
cluster-autoscaler/main.go 2 additions, 0 deletions

cluster-autoscaler/main.go

with 97 additions and 38 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please sign in to comment