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

charts,build,salt: Add fluent-bit pod memory limits to 1Gi #3845

Merged
merged 1 commit into from
Aug 5, 2022
Merged

charts,build,salt: Add fluent-bit pod memory limits to 1Gi #3845

merged 1 commit into from
Aug 5, 2022

Conversation

TeddyAndrieux
Copy link
Collaborator

Add a fluent-bit pod memory limits to 1Gi and make it configurable

@TeddyAndrieux TeddyAndrieux requested a review from a team as a code owner August 4, 2022 13:01
@bert-e
Copy link
Contributor

bert-e commented Aug 4, 2022

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 Aug 4, 2022

Conflict

A conflict has been raised during the creation of
integration branch w/124.0/improvement/add-limit-on-fluent-bit with contents from improvement/add-limit-on-fluent-bit
and development/124.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/124.0/improvement/add-limit-on-fluent-bit origin/development/124.0
 $ git merge origin/improvement/add-limit-on-fluent-bit
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/124.0/improvement/add-limit-on-fluent-bit

@bert-e
Copy link
Contributor

bert-e commented Aug 4, 2022

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
charts,build,salt: Add fluent-bit pod memory limits to 1Gi
2a25df3 
Add a fluent-bit pod memory limits to 1Gi and make it configurable

Re-render fluent-bit salt state using:
```
./charts/render.py fluent-bit \
  charts/fluent-bit.yaml charts/fluent-bit/ \
  --namespace metalk8s-logging \
  --service-config fluent_bit metalk8s-fluent-bit-config \
  metalk8s/addons/logging/fluent-bit/config/fluent-bit.yaml metalk8s-logging \
  > salt/metalk8s/addons/logging/fluent-bit/deployed/chart.sls
```
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/add-limit-on-fluent-bit branch from c79f9e6 to 2a25df3 Compare August 4, 2022 13:55
@bert-e
Copy link
Contributor

bert-e commented Aug 4, 2022

History mismatch

Merge commit #c79f9e6ae4cc76705ba8ad736f6cab50897679a7 on the integration branch
w/124.0/improvement/add-limit-on-fluent-bit is merging a branch which is neither the current
branch improvement/add-limit-on-fluent-bit nor the development branch
development/124.0.

It is likely due to a rebase of the branch improvement/add-limit-on-fluent-bit 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 Aug 4, 2022

Reset complete

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

@bert-e
Copy link
Contributor

bert-e commented Aug 4, 2022

Conflict

A conflict has been raised during the creation of
integration branch w/124.0/improvement/add-limit-on-fluent-bit with contents from improvement/add-limit-on-fluent-bit
and development/124.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/124.0/improvement/add-limit-on-fluent-bit origin/development/124.0
 $ git merge origin/improvement/add-limit-on-fluent-bit
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/124.0/improvement/add-limit-on-fluent-bit

@bert-e
Copy link
Contributor

bert-e commented Aug 4, 2022

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 Aug 5, 2022

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/123.0

  • ✔️ development/124.0

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • 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 Aug 5, 2022

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

  • ✔️ development/123.0

  • ✔️ development/124.0

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • 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 2a25df3 into development/123.0 Aug 5, 2022
@bert-e bert-e deleted the improvement/add-limit-on-fluent-bit branch August 5, 2022 06: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

@JBWatenbergScality JBWatenbergScality JBWatenbergScality left review comments

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

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