Rebase 1.18 #139
Merged
Rebase 1.18 #139
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
This is temporary hack. We should stop using for-go-proj.sh to verify cluster autoscaler and migrate to directly calling make. Change-Id: I0c41c918f78cdfa0e5fd0dd60139a54db90540ea
…rk-poc3 Scheduler Framework based PredicateChecker
VPA - Injected sidecar e2e test
…ater VPA - Moving status updater to utils
…s_tests VPA - Removing k8s tests from vpa tests
VPA - Removing e2e common tests
…_test VPA - Reducing copy-pasted code in updater tests
VPA - Status e2e test
|
/verify-owners |
enxebre
removed
the
do-not-merge/invalid-owners-file
openshift-ci-robot
added
the
do-not-merge/invalid-owners-file
enxebre
removed
the
do-not-merge/invalid-owners-file
…ployment resource does not exist. We don't have machineDeployment CRD on OCP. If we introduce this logic upsteam this commit can be dropped.
This reverts commit 6601bf0. See kubernetes#2495
This is currently used by our e2e testing https://github.com/openshift/cluster-api-actuator-pkg/blob/master/pkg/autoscaler/autoscaler.go#L383. This should be contributed upsteam and possibly also prevent the e2e from reyling on events.
update cluster-autoscaler OWNERS and remove owners which do not belong the openshift org so also CI is happy.
openshift-ci-robot
added
the
do-not-merge/invalid-owners-file
|
The following users are mentioned in OWNERS file(s) but are not members of the openshift org. Once all users have been added as members of the org, you can trigger verification by writing
|
enxebre
removed
the
do-not-merge/invalid-owners-file
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: JoelSpeed 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 |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
enxebre
added a commit
to enxebre/cluster-autoscaler-operator
that referenced
this pull request
Mar 20, 2020
Since we merged the clusterapi provider upstream we are now consuming that directly openshift/kubernetes-autoscaler#139 This is to minimise the commits we need to carry on top by using the upstream flag/env variables.
Merged
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 kubernetes@ee627f2 as the base and then applying "UPSTREAM:" patches on top.
ee627f2 was chosen instead of https://github.com/kubernetes/autoscaler/tree/cluster-autoscaler-release-1.18 to get the ability to autodiscover the API version kubernetes#2934.
The set of picks applied was derived from:
where c9e97b reflects the changes since our last rebase (which was 1.17 #121 ).
This is different from other releases (#120, #121) since we got merge the provider upstream kubernetes#1866 so the number of commits we need to carry over will be minimal and keep decreasing from now on.
Process
To create the merge commit I have used the following steps:
The set of carried commits can be divided in 3 groups:
A first group of commits are carried to sort out the CI system jobs. Some of them might be considered to be dropped in upcoming releases since I believe some where needed for a 3.* context and not all of them are required anymore. They will possibly be conflated in the next rebase.
The set of carried commits can be divided in 3 groups:
A first group of commits are carried to sort out the CI system jobs. Some of them might be considered to be dropped in upcoming releases since I believe some where needed for a 3.* context and not all of them are required anymore. They will possibly be conflated in the next rebase.
Three new commits were added to get the CAPI provider working.
Most of these should be dropped once we make CAO set the new parameters.
And some commits were carried to keep our e2e CI green.