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

salt: Skip "Pending" pods when draining a node #3641

Merged
merged 1 commit into from
Dec 16, 2021
Merged

salt: Skip "Pending" pods when draining a node #3641

merged 1 commit into from
Dec 16, 2021

Conversation

TeddyAndrieux
Copy link
Collaborator

In most cases, it does not make sense to try to evict a Pod which is
Pending as this one is not yet running and it also can cause trouble
during MetalK8s expansions as some Pod may be Pending on a node that is
not yet deployed (so the Pending pod cannot get evicted).

Let's skip "Pending" pods by default when we drain a node in
deploy_node orchestrate (used during expansions and upgrade,
downgrade)

@TeddyAndrieux TeddyAndrieux requested a review from a team December 15, 2021 17:28
@bert-e
Copy link
Contributor

bert-e commented Dec 15, 2021

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Dec 15, 2021

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Dec 15, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@TeddyAndrieux
salt: Skip "Pending" pods when draining a node
60df8ec 
In most cases, it does not make sense to try to evict a Pod which is
Pending as this one is not yet running and it also can cause trouble
during MetalK8s expansions as some Pod may be Pending on a node that is
not yet deployed (so the Pending pod cannot get evicted).

Let's skip "Pending" pods by default when we drain a node in
`deploy_node` orchestrate (used during expansions and upgrade,
downgrade)
@TeddyAndrieux TeddyAndrieux force-pushed the bugfix/do-not-drain-pending-pods branch from 2f445c5 to 60df8ec Compare December 15, 2021 17:28
@bert-e
Copy link
Contributor

bert-e commented Dec 15, 2021

History mismatch

Merge commit #2f445c52d49e8ceb49af05435d432bb9b96a26a5 on the integration branch
w/2.11/bugfix/do-not-drain-pending-pods is merging a branch which is neither the current
branch bugfix/do-not-drain-pending-pods nor the development branch
development/2.11.

It is likely due to a rebase of the branch bugfix/do-not-drain-pending-pods and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@TeddyAndrieux
Copy link
Collaborator Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Dec 15, 2021

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Dec 15, 2021

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Dec 15, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

gdemonet
gdemonet approved these changes Dec 15, 2021
View reviewed changes
Copy link
Contributor

@gdemonet gdemonet left a comment

Choose a reason for hiding this comment

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

:shipit:

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Dec 15, 2021

Build failed

The build for commit did not succeed in branch w/2.11/bugfix/do-not-drain-pending-pods.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 15, 2021

Build failed

The build for commit did not succeed in branch w/123.0/bugfix/do-not-drain-pending-pods.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 15, 2021

Build failed

The build for commit did not succeed in branch w/2.11/bugfix/do-not-drain-pending-pods.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 16, 2021

Build failed

The build for commit did not succeed in branch w/123.0/bugfix/do-not-drain-pending-pods.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 16, 2021

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.10

  • ✔️ development/2.11

  • ✔️ development/123.0

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Dec 16, 2021

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.10

  • ✔️ development/2.11

  • ✔️ development/123.0

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 60df8ec into development/2.10 Dec 16, 2021
@bert-e bert-e deleted the bugfix/do-not-drain-pending-pods branch December 16, 2021 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gdemonet gdemonet gdemonet approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TeddyAndrieux @bert-e @gdemonet