Rebase 1.17.0 #121
Merged
Rebase 1.17.0 #121
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ovider-id doks: use providerID for node.ID
Extract separate package for core/utils.go and split into multiple files.
Signed-off-by: Julien Balestra <julien.balestra@datadoghq.com>
Addresses a [comment on PR2235](https://github.com/kubernetes/autoscaler/pull/2235/files#r313536379) to remove the unnecessary use of a regex with a simpler string prefix matching for placeholder names.
The example for using MixedInstancePolicy was accidentally placed under the new section of the docs for using static instance types, instead of its correct location under the MixedInstancePolicy section.
Cleans up the documentation regarding the IAM policy permissions that need to be added for cluster autoscaler to work properly, depending on the features desired.
[aws] minor documentation fixes
fix golint failures
Update RBAC in Azure examples to include csinodes permission
This patch adds a rate limiter to the vertical pod autoscaler updater. It adds two flags - eviction-rate-limit to control the number of pods that can be evicted every seconds. - eviction-rate-limit-burst to control the burst of that can be evicted immediately.
Add rate limiter to the Vertical Pod autoscaler updater component
…ailures Fix ineffassign failures
Whitelist additional node labels for AWS CNI custom networking and EC2 lifecycle. Move AWS ignored node labels to AWS specific file.
AWS M5 instance types may differ in memory capacity by more than 128MB.
|
/hold |
openshift-ci-robot
added
do-not-merge/hold
|
@enxebre it would be useful to have the description filled out in the same way we did with the other rebases. |
update cluster-autoscaler OWNERS and remove owners which do not belong the openshift org so also CI is happy.
This reverts commit 6601bf0. See kubernetes#2495
…chineapi revendor via hack/update-vendor.sh to get machine API deps on top of the kubernetes commit used here https://github.com/kubernetes/autoscaler/tree/cluster-autoscaler-1.17.0/cluster-autoscaler/vendor
enxebre
force-pushed
the
rebase-1.17.0
branch
from
2c5068f
to
bbeccaa
Compare
openshift-ci-robot
removed
the
do-not-merge/work-in-progress
|
/hold cancel |
|
/verify-owners |
|
/hold cancel |
openshift-ci-robot
removed
the
do-not-merge/hold
|
/verify-owners |
openshift-ci-robot
removed
the
do-not-merge/invalid-owners-file
|
/retest |
|
/test e2e-gcp-operator |
|
/test e2e-azure-operator |
Merged
JoelSpeed
pushed a commit
to JoelSpeed/autoscaler
that referenced
this pull request
Apr 27, 2020
AWS M5 instance types may differ in memory capacity by more than 128MB. Originally introduced to Openshift as part of openshift#121 during the 4.4 release cycle.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rebase:
The PR was created by first taking https://github.com/kubernetes/autoscaler/tree/cluster-autoscaler-1.17.0 as the base then applying UPSTREAM: patches on top. The set of picks applied was derived from:
git log --oneline --no-merges 2ebb7af7e02fd4dbae19e250ebe6fc44fddddc71..openshift/masterwhere 2ebb7af reflects the changes since our last rebase (which was 1.16 #120).
And in that set of picks UPSTREAM: : openshift: Bump deps for cloudprovider/openshiftmachineapi move up to the top of the history for convenience and it was used to revendor using the new upstream flow which relies on cluster-autoscaler/hack/update-vendor.sh.
For it to succeed with revendored against this kubernetes commit
711790af23a231ade04c6c39d6bc5dcf1a996f73as per https://github.com/kubernetes/autoscaler/tree/cluster-autoscaler-1.17.0/cluster-autoscaler/vendorThis is because upstream autoscaler missed kubernetes 1.17.0 release and revendored against this post release commit https://kubernetes.slack.com/archives/C09R1LV8S/p1578936477049500
Deps:
Autoscaler 1.17.0 introduce leader election mechanism to use lease objects, therefore cao needs to extend the rbac.
Needs openshift/cluster-autoscaler-operator#131
Rebase process
To create the merge commit I have used the following steps:
$ git remote update
$ git checkout cluster-autoscaler-1.17.0
$ git checkout -b merge
$ git checkout openshift/master
$ echo 'merge upstream/cluster-autoscaler-1.17.0' | git commit-tree merge^{tree} -p HEAD -p merge
deadbeef12345678
$ git checkout deadbeef12345678
$ git cherry-pick 2cc1cb3^..90c34ac