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,docs: Make terminated-pod-gc-threshold configurable #3621

Merged
merged 1 commit into from
Dec 3, 2021
Merged

salt,docs: Make terminated-pod-gc-threshold configurable #3621

merged 1 commit into from
Dec 3, 2021

Conversation

TeddyAndrieux
Copy link
Collaborator

Allow managing the terminated-pod-gc-threshold argument from the
Bootstrap configuration, and default to 500 (note the current version of
controller manager default is 12500)

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

bert-e commented Nov 30, 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 Nov 30, 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.10
  • 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 Nov 30, 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 TeddyAndrieux force-pushed the improvement/lower-terminated-pod-gc-threshold branch from c6ea261 to 6a90705 Compare November 30, 2021 15:18
@bert-e
Copy link
Contributor

bert-e commented Nov 30, 2021

History mismatch

Merge commit #c6ea261c661e38739c5b901833ea07de24fc4aae on the integration branch
w/123.0/improvement/lower-terminated-pod-gc-threshold is merging a branch which is neither the current
branch improvement/lower-terminated-pod-gc-threshold nor the development branch
development/123.0.

It is likely due to a rebase of the branch improvement/lower-terminated-pod-gc-threshold 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 Nov 30, 2021

Reset complete

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

@bert-e
Copy link
Contributor

bert-e commented Nov 30, 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.10
  • 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 Nov 30, 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:

alexandre-allard
alexandre-allard reviewed Dec 3, 2021
View reviewed changes
Copy link
Contributor

@alexandre-allard alexandre-allard left a comment

Choose a reason for hiding this comment

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

LGTM, just details on CHANGELOG.

CHANGELOG.md Outdated Show resolved Hide resolved
docs/installation/bootstrap.rst Outdated Show resolved Hide resolved
@TeddyAndrieux
salt,docs: Make terminated-pod-gc-threshold configurable
a3021ea 
Allow to manage the `terminated-pod-gc-threshold` argument from the
Bootstrap configuration, and default to 500 (note the current version of
controller manager default is 12500)
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/lower-terminated-pod-gc-threshold branch from 6a90705 to a3021ea Compare December 3, 2021 16:54
@bert-e
Copy link
Contributor

bert-e commented Dec 3, 2021

History mismatch

Merge commit #6a90705c60a679f9f669f924fb7b6b880095a9cb on the integration branch
w/123.0/improvement/lower-terminated-pod-gc-threshold is merging a branch which is neither the current
branch improvement/lower-terminated-pod-gc-threshold nor the development branch
development/123.0.

It is likely due to a rebase of the branch improvement/lower-terminated-pod-gc-threshold 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 3, 2021

Reset complete

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

@bert-e
Copy link
Contributor

bert-e commented Dec 3, 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.10
  • 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 3, 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
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Dec 3, 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.11

  • ✔️ development/123.0

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.10
  • 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 3, 2021

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

  • ✔️ development/2.11

  • ✔️ development/123.0

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • development/2.10
  • 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 a3021ea into development/2.11 Dec 3, 2021
@bert-e bert-e deleted the improvement/lower-terminated-pod-gc-threshold branch December 3, 2021 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexandre-allard alexandre-allard alexandre-allard 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.

None yet
3 participants
@TeddyAndrieux @bert-e @alexandre-allard