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.

Sign up for GitHub

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

Jump to bottom

Add upstream patch for node group autodiscovery #179

Merged
merged 2 commits into from
Dec 9, 2020
Merged

Add upstream patch for node group autodiscovery #179

merged 2 commits into from
Dec 9, 2020

Conversation

elmiko
Copy link

@elmiko elmiko commented Nov 4, 2020

This change set brings in the upstream pull request (kubernetes#3314) to add an option for node group autodiscovery. It also carries a patch to ensure that the changes to do not disrupt openshift.

@elmiko
Copy link
Author

elmiko commented Nov 4, 2020

this needs to wait for #177
/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 4, 2020
This was referenced Nov 5, 2020
Merged
Merged
@elmiko
Copy link
Author

elmiko commented Nov 9, 2020

this is required for #180

@JoelSpeed
Copy link

I've had an initial pass over this PR, as far as I can tell the last 2 commits are in addition to #177 right?

This autodiscovery filtering is done before the filtering that we do normally right? IE this shouldn't affect the behaviour of the autoscaler at all for us unless we start using the autoscaler discovery flag?

@elmiko
Copy link
Author

elmiko commented Nov 11, 2020

I've had an initial pass over this PR, as far as I can tell the last 2 commits are in addition to #177 right?

yes, i will rebase once 177 is merged

This autodiscovery filtering is done before the filtering that we do normally right? IE this shouldn't affect the behaviour of the autoscaler at all for us unless we start using the autoscaler discovery flag?

correct. this will not affect us unless we expose the filtering flag.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 16, 2020
@elmiko
Copy link
Author

elmiko commented Nov 20, 2020

this needs to merge before #180

@elmiko elmiko force-pushed the openshift/add-node-autodiscovery branch from 0a4e32f to c1e3e3f Compare November 20, 2020 17:58
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 20, 2020
@elmiko elmiko force-pushed the openshift/add-node-autodiscovery branch from c1e3e3f to b3087dc Compare November 20, 2020 18:09
@elmiko
Copy link
Author

elmiko commented Nov 20, 2020

rebased

@elmiko
Copy link
Author

elmiko commented Nov 20, 2020

this needs to merge before #180

detiber and others added 2 commits November 30, 2020 16:27
@detiber @elmiko
UPSTREAM: <drop>: openshift: Add node autodiscovery to cluster-autosc…
71ef9a5 
…aler clusterapi provider
@elmiko
UPSTREAM: <carry>: openshift: add fixes for node autodiscovery
bf74515 
This change add a few necessary changes to ensure that the upstream node
autodiscovery patch works.

* Add logic to `newNodeGroupFromScalableResource` to detect condition
  where a node group is capable of scaling from zero.
* Change `clusterNameLabel` to match the openshift label.
* Fix TestNodeGroupTemplateNodeInfo unit test to use new create test
  config functions.
@elmiko elmiko force-pushed the openshift/add-node-autodiscovery branch from b3087dc to bf74515 Compare November 30, 2020 21:27
@elmiko
Copy link
Author

elmiko commented Nov 30, 2020

rebased after 177 merged
/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 Nov 30, 2020
@elmiko
Copy link
Author

elmiko commented Dec 1, 2020

/retest

3 similar comments
@elmiko
Copy link
Author

elmiko commented Dec 2, 2020

/retest

@elmiko
Copy link
Author

elmiko commented Dec 2, 2020

/retest

@elmiko
Copy link
Author

elmiko commented Dec 2, 2020

/retest

JoelSpeed
JoelSpeed reviewed Dec 8, 2020
View reviewed changes
Copy link

@JoelSpeed JoelSpeed left a comment

Choose a reason for hiding this comment

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

/approve

This looks fine, I had some questions while reviewing but answered them inline

@openshift-ci-robot
Copy link

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 8, 2020
@Danil-Grigorev
Copy link

Can't comment on the pulled code from the upstream much, but the tests are passing with the commit bf74515
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 9, 2020
@openshift-merge-robot openshift-merge-robot merged commit 54f820d into openshift:master Dec 9, 2020
@elmiko elmiko deleted the openshift/add-node-autodiscovery branch December 9, 2020 16:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JoelSpeed JoelSpeed JoelSpeed left review comments

@alexander-demicev alexander-demicev Awaiting requested review from alexander-demicev

Assignees

@Danil-Grigorev Danil-Grigorev

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@elmiko @JoelSpeed @openshift-ci-robot @Danil-Grigorev @openshift-merge-robot @detiber