Rebase 1.19.0 #164
Merged
Rebase 1.19.0 #164
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
slusterState -> clusterState
Fix comment typo
The following things changed in scheduler and needed to be fixed: * NodeInfo was moved to schedulerframework * Some fields on NodeInfo are now exposed directly instead of via getters * NodeInfo.Pods is now a list of *schedulerframework.PodInfo, not *apiv1.Pod * SharedLister and NodeInfoLister were moved to schedulerframework * PodLister was removed
Update vendor & fix breaking scheduler changes
Small update to reflect that usage of multi-AZ ASGs are supported, and the relevant considerations for using them. a couple of other small changes in the MixedInstancesPolicy section as well.
Co-Authored-By: Guy Templeton <guyjtempleton@googlemail.com>
Add api-approved label to the Vertical Pod Autoscaler API
This change adds a readme which describes the basic operation of the cluster-api provider.
add readme file for cluster-api provider
add EphemeralStorage in group template
Update readme with ASG considerations and MixedInstancesPolicy notes
fixing wrong syntax in links that were merged in kubernetes#3096 (had a space between ']' and '(' so the links didn't work)
Update README.md
Fix a minor typo in the README
Typo - Assert using the right containers
Signed-off-by: Marc Sensenich <sensenichm91@gmail.com>
Signed-off-by: Marc Sensenich <sensenichm91@gmail.com>
This is needed for map containerName: aggregatedState to contain complete information (not only samples, but also resource policy), which can be later processed downstream. In particular, it is needed for VPA controlled resources.
e2-micro and e2-small have allocatable set too high resulting in overcommit. To make cluster autoscaler prefer e2-medium given the choice between the three machine types, the prices for e2-micro and e2-small are artificially set to be higher than the price of e2-medium.
Add prices for all machine types, adjust e2 fractional VM pricing
|
/test e2e-azure-operator |
|
@elmiko: The following test failed, say
Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
/test e2e-azure-operator |
Procedure seems ok to me. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: enxebre The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
|
/lgtm @elmiko I assume you're happy for this to merge, but I'll hold until you're online just in case, unhold if you're ready |
openshift-ci-robot
added
the
do-not-merge/hold
|
@JoelSpeed i'm good to merge this, i don't think i would do any other adjustments for 1.19. for 1.20, we can target squashing all those commits Alberto mentioned. |
|
/hold cancel |
openshift-ci-robot
removed
the
do-not-merge/hold
This was referenced Jan 7, 2022
This was referenced Mar 2, 2022
This was referenced Aug 16, 2022
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.
This commit rebases the autoscaler on top of the Kubernetes/Autoscaler 1.19.0 release. There are several commits that we carry on top of the upstream autoscaler and the rebase process allows us to preserve those. Here is a description of the process I used to create this PR.
(inspired by the commit description for the 1.18 rebase. pr #139)
Process
First we need to identify the carry commits that we currently have, this is done against our previous rebase to catch new changes. Once identified we will drop commits which have merged upstream and only carry unique commits. (see below for the carried and dropped commits).
Identify carry commits:
where
a1ddf4reflects the changes since our last rebase (1.18.0). this is thelist of commits we will need to apply onto the new upstream version of the
autoscaler. ideally, some of these commits can be dropped.
After identifying the carry commits, the next step is to create the new commit-tree that will be used for the rebase and then cherry pick the carry commits into the new branch. The following commands cover these steps:
With the
merge-1.19.0branch in place, I cherry picked the carry commits which applied, resolved merge conflicts, and finally tested the resulting tree against the unit test and end-to-end suite.Carried Commits
These commits are for features which have not yet been accepted upstream, are integral to our CI platform, or are specific to the releases we create for OpenShift.
Dropped Commits
These commits were carried over the 1.18.x release history and represent work that has been accepted upstream.