Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase 1.17.0 #121

Merged
merged 360 commits into from
Jan 15, 2020
Merged

Rebase 1.17.0 #121

merged 360 commits into from
Jan 15, 2020

Conversation

enxebre
Copy link
Member

@enxebre enxebre commented Jan 13, 2020

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/master

where 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 711790af23a231ade04c6c39d6bc5dcf1a996f73 as per https://github.com/kubernetes/autoscaler/tree/cluster-autoscaler-1.17.0/cluster-autoscaler/vendor

This 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

Steven Normore and others added 30 commits October 21, 2019 12:48
…ovider-id

doks: use providerID for node.ID
Extract separate package for core/utils.go and split into multiple files.
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.
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
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.
@enxebre
Copy link
Member Author

enxebre commented Jan 13, 2020

/hold

@openshift-ci-robot openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. labels Jan 13, 2020
@frobware
Copy link

@enxebre it would be useful to have the description filled out in the same way we did with the other rebases.

enxebre and others added 3 commits January 14, 2020 11:53
update cluster-autoscaler OWNERS and remove owners which do not belong the openshift org so also CI is happy.
@enxebre enxebre changed the title WIP: Rebase 1.17.0 Rebase 1.17.0 Jan 14, 2020
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 14, 2020
@enxebre
Copy link
Member Author

enxebre commented Jan 14, 2020

/hold cancel

@enxebre
Copy link
Member Author

enxebre commented Jan 14, 2020

/verify-owners

@enxebre
Copy link
Member Author

enxebre commented Jan 14, 2020

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 14, 2020
@enxebre
Copy link
Member Author

enxebre commented Jan 14, 2020

/verify-owners

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. label Jan 14, 2020
@enxebre
Copy link
Member Author

enxebre commented Jan 14, 2020

/retest

@enxebre
Copy link
Member Author

enxebre commented Jan 14, 2020

/test e2e-gcp-operator

@enxebre
Copy link
Member Author

enxebre commented Jan 14, 2020

/test e2e-azure-operator

Copy link

@bison bison left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 15, 2020
@openshift-merge-robot openshift-merge-robot merged commit 253ee49 into openshift:master Jan 15, 2020
@enxebre enxebre mentioned this pull request Mar 17, 2020
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
Labels
lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.