Allow to setup Loki `resources` from CSC #3737

TeddyAndrieux · 2022-03-29T14:30:32Z

Since Loki has no way to limit the "in-memory" total chunk size in some
cases we may want to put a hard limit on the memory for the Loki pod in
order to avoid Loki to consume all the memory and make the server crash

Due to a bug in Black and a new release of Click the current pre-commit hook is not working, we can either pin the Click version or bump black version since the bug got fixed. See: psf/black#2964

bert-e · 2022-03-29T14:30:34Z

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 · 2022-03-29T14:30:39Z

Conflict

A conflict has been raised during the creation of
integration branch w/123.0/improvement/allow-to-setup-loki-ressources with contents from improvement/allow-to-setup-loki-ressources
and development/123.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/123.0/improvement/allow-to-setup-loki-ressources origin/development/123.0
 $ git merge origin/improvement/allow-to-setup-loki-ressources
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/123.0/improvement/allow-to-setup-loki-ressources

bert-e · 2022-03-29T14:35:27Z

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:

CHANGELOG.md

bert-e · 2022-03-29T14:59:42Z

History mismatch

Merge commit #9649d9665a77b725c6dd21cc17b6d473fc77ec93 on the integration branch
w/123.0/improvement/allow-to-setup-loki-ressources is merging a branch which is neither the current
branch improvement/allow-to-setup-loki-ressources nor the development branch
development/123.0.

It is likely due to a rebase of the branch improvement/allow-to-setup-loki-ressources 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 · 2022-03-29T15:00:15Z

/reset

bert-e · 2022-03-29T15:00:21Z

Reset complete

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

bert-e · 2022-03-29T15:00:27Z

Conflict

A conflict has been raised during the creation of
integration branch w/123.0/improvement/allow-to-setup-loki-ressources with contents from improvement/allow-to-setup-loki-ressources
and development/123.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/123.0/improvement/allow-to-setup-loki-ressources origin/development/123.0
 $ git merge origin/improvement/allow-to-setup-loki-ressources
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/123.0/improvement/allow-to-setup-loki-ressources

bert-e · 2022-03-29T15:03:11Z

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:

docs/operation/cluster_and_service_configuration.rst

Since Loki has no way to limit the "in-memory" total chunk size in some cases we may want to put an hard limit on the memory for the Loki pod in order to avoid Loki to consume all the memory and make the server crash Re-render the salt state using: ``` ./charts/render.py loki --namespace metalk8s-logging \ --service-config loki metalk8s-loki-config \ metalk8s/addons/logging/loki/config/loki.yaml metalk8s-logging \ --patch 'StatefulSet,metalk8s-logging,loki,spec:template:spec:containers:0:ports:1, {"name": "memberlist", "containerPort": 7946, "protocol": "TCP"}' \ --remove-manifest Secret loki charts/loki.yaml charts/loki/ \ > salt/metalk8s/addons/logging/loki/deployed/chart.sls ```

bert-e · 2022-03-29T15:22:59Z

History mismatch

Merge commit #b2e012e51c7c6e71cd2de2048396e1b3d490744f on the integration branch
w/123.0/improvement/allow-to-setup-loki-ressources is merging a branch which is neither the current
branch improvement/allow-to-setup-loki-ressources nor the development branch
development/123.0.

It is likely due to a rebase of the branch improvement/allow-to-setup-loki-ressources 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 · 2022-03-29T15:23:06Z

/reset

bert-e · 2022-03-29T15:23:11Z

Lossy reset warning

There seems to be manual commits on integration branches (e.g. conflict
resolutions) that will be lost if you chose to reset.

You can use the force_reset command if you still want me
to delete those branches.

bert-e · 2022-03-29T15:23:16Z

History mismatch

Merge commit #b2e012e51c7c6e71cd2de2048396e1b3d490744f on the integration branch
w/123.0/improvement/allow-to-setup-loki-ressources is merging a branch which is neither the current
branch improvement/allow-to-setup-loki-ressources nor the development branch
development/123.0.

It is likely due to a rebase of the branch improvement/allow-to-setup-loki-ressources 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 · 2022-03-29T15:23:16Z

/force_reset

bert-e · 2022-03-29T15:23:22Z

Reset complete

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

bert-e · 2022-03-29T15:23:27Z

Conflict

A conflict has been raised during the creation of
integration branch w/123.0/improvement/allow-to-setup-loki-ressources with contents from improvement/allow-to-setup-loki-ressources
and development/123.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/123.0/improvement/allow-to-setup-loki-ressources origin/development/123.0
 $ git merge origin/improvement/allow-to-setup-loki-ressources
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/123.0/improvement/allow-to-setup-loki-ressources

bert-e · 2022-03-29T15:25:03Z

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 · 2022-03-29T15:25:05Z

/approve

bert-e · 2022-03-29T17:07:53Z

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 · 2022-03-29T17:08:01Z

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.

pre-commit,salt: Bump black version and re-run it

ed75868

Due to a bug in Black and a new release of Click the current pre-commit hook is not working, we can either pin the Click version or bump black version since the bug got fixed. See: psf/black#2964

TeddyAndrieux requested a review from a team as a code owner March 29, 2022 14:30

gdemonet previously approved these changes Mar 29, 2022

View reviewed changes

CHANGELOG.md Show resolved Hide resolved

TeddyAndrieux dismissed gdemonet’s stale review via b2e012e March 29, 2022 14:59

TeddyAndrieux force-pushed the improvement/allow-to-setup-loki-ressources branch from 9649d96 to b2e012e Compare March 29, 2022 14:59

TeddyAndrieux changed the title ~~Allow to setup Loki ressources from CSC~~ Allow to setup Loki resources from CSC Mar 29, 2022

gdemonet reviewed Mar 29, 2022

View reviewed changes

docs/operation/cluster_and_service_configuration.rst Outdated Show resolved Hide resolved

TeddyAndrieux force-pushed the improvement/allow-to-setup-loki-ressources branch from b2e012e to 52c5009 Compare March 29, 2022 15:22

gdemonet approved these changes Mar 29, 2022

View reviewed changes

bert-e merged commit 52c5009 into development/2.11 Mar 29, 2022

bert-e deleted the improvement/allow-to-setup-loki-ressources branch March 29, 2022 17:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow to setup Loki `resources` from CSC #3737

Allow to setup Loki `resources` from CSC #3737

TeddyAndrieux commented Mar 29, 2022

bert-e commented Mar 29, 2022

bert-e commented Mar 29, 2022

bert-e commented Mar 29, 2022

bert-e commented Mar 29, 2022

TeddyAndrieux commented Mar 29, 2022

bert-e commented Mar 29, 2022

bert-e commented Mar 29, 2022

bert-e commented Mar 29, 2022

bert-e commented Mar 29, 2022

TeddyAndrieux commented Mar 29, 2022

bert-e commented Mar 29, 2022

bert-e commented Mar 29, 2022

TeddyAndrieux commented Mar 29, 2022

bert-e commented Mar 29, 2022

bert-e commented Mar 29, 2022

bert-e commented Mar 29, 2022

TeddyAndrieux commented Mar 29, 2022

bert-e commented Mar 29, 2022

bert-e commented Mar 29, 2022

Allow to setup Loki resources from CSC #3737

Allow to setup Loki resources from CSC #3737

Conversation

TeddyAndrieux commented Mar 29, 2022

bert-e commented Mar 29, 2022

Hello teddyandrieux,

bert-e commented Mar 29, 2022

Conflict

bert-e commented Mar 29, 2022

Waiting for approval

bert-e commented Mar 29, 2022

History mismatch

TeddyAndrieux commented Mar 29, 2022

bert-e commented Mar 29, 2022

Reset complete

bert-e commented Mar 29, 2022

Conflict

bert-e commented Mar 29, 2022

Waiting for approval

bert-e commented Mar 29, 2022

History mismatch

TeddyAndrieux commented Mar 29, 2022

bert-e commented Mar 29, 2022

Lossy reset warning

bert-e commented Mar 29, 2022

History mismatch

TeddyAndrieux commented Mar 29, 2022

bert-e commented Mar 29, 2022

Reset complete

bert-e commented Mar 29, 2022

Conflict

bert-e commented Mar 29, 2022

Waiting for approval

TeddyAndrieux commented Mar 29, 2022

bert-e commented Mar 29, 2022

In the queue

bert-e commented Mar 29, 2022

Allow to setup Loki `resources` from CSC #3737

Allow to setup Loki `resources` from CSC #3737