Skip to content

feat(helm): Add health probes to bloom-gateway - #18551

Merged
Jayclifford345 merged 5 commits into
grafana:mainfrom
lindhe:bloom-gateway-healthprobes
Aug 19, 2025
Merged

feat(helm): Add health probes to bloom-gateway#18551
Jayclifford345 merged 5 commits into
grafana:mainfrom
lindhe:bloom-gateway-healthprobes

Conversation

@lindhe

@lindhe lindhe commented Jul 23, 2025

Copy link
Copy Markdown
Contributor

What this PR does / why we need it:

Adds configurable livenessProbe and startupProbe to the bloom-gateway container in the bloom-gateway pods.

Which issue(s) this PR fixes:

Partially addresses #13678

Special notes for your reviewer:

Partially replaces #15359

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR
@lindhe
lindhe requested a review from a team as a code owner July 23, 2025 13:20
@jkroepke

Copy link
Copy Markdown
Contributor

CI:

Error from server (BadRequest): container "query-frontend" in pod "loki-oef3k0fujj-query-frontend-5665878895-5sgph" is waiting to start: ContainerCreating

Comment thread production/helm/loki/CHANGELOG.md Outdated
Comment thread production/helm/loki/values.yaml Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The lines here are on each of your PRs. Keep in mind if one of them are merged, all other PRs will have a merge conflict then.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the heads-up. I intentionally based them all off of the same commit, to ensure there's no changes between them. I believe there will be no conflict since these are the exact same changes in each PR.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

In the changelog, on the other hand, there will be conflicts every time I fear. But no easy way around that, I think.

@lindhe

lindhe commented Jul 24, 2025

Copy link
Copy Markdown
Contributor Author

CI:

Error from server (BadRequest): container "query-frontend" in pod "loki-oef3k0fujj-query-frontend-5665878895-5sgph" is waiting to start: ContainerCreating

Turns out that some components (at least templates/distributor/deployment-distributor.yaml) was already using .Values.loki.{livenessProbe,startupProbe} despite them being unset before. So when I introduced them and set them to {} by default, that broke the existing logic.

In commit abe8bc2 I set them to null instead of {}. That makes it backwards compatible, at the expense of not being so clear about the type of the fields. Do you prefer that, or should I instead set them to {} by default and instead try and hunt down all instances where they are used and change the templates to handle {} properly?

@jkroepke

Copy link
Copy Markdown
Contributor

I personally would prefer {} by default. That indicate the type of the values as you already mentioned it.

@lindhe

lindhe commented Jul 24, 2025

Copy link
Copy Markdown
Contributor Author

I think that's a good decision. But I also think that it belongs to a separate PR, since it refactors existing components rather than introduce new functionality.

I'll make a new PR for it, but just tell me if you much prefer it all to go here and I'll cherry-pick the relevant commits into this branch/PR instead.

@lindhe

lindhe commented Jul 24, 2025

Copy link
Copy Markdown
Contributor Author

Created the new PR here: #18575

I'll rebase all other PRs once that has been merged.

lindhe and others added 3 commits August 15, 2025 18:57
Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com>
Adds configurable `livenessProbe` and `startupProbe` to the bloom-gateway
container in the bloom-gateway pods.

Co-authored-by: Jan-Otto Kröpke <mail@jkroepke.de>
Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com>
Done via the following command:

```shell
docker run -it --rm -v "$(pwd):/go" --entrypoint bash -e BUILD_IN_CONTAINER=false grafana/loki-build-image:0.34.6 -c 'git config --global --add safe.directory /go; make -BC docs sources/setup/install/helm/reference.md'
```

Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com>
@lindhe
lindhe force-pushed the bloom-gateway-healthprobes branch from 50357da to 77c88f6 Compare August 15, 2025 17:14

@jkroepke jkroepke left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I guess the CI will miss the new loki.startupProbe in the docs as well. or I'm wrong?

@lindhe

lindhe commented Aug 16, 2025

Copy link
Copy Markdown
Contributor Author

I guess the CI will miss the new loki.startupProbe in the docs as well. or I'm wrong?

In README.md or in reference.md? How do I generate it?

@jkroepke

Copy link
Copy Markdown
Contributor

No, CI is green. So LGTM.

Signed-off-by: Jay Clifford <45856600+Jayclifford345@users.noreply.github.com>

@Jayclifford345 Jayclifford345 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

Signed-off-by: Jay Clifford <45856600+Jayclifford345@users.noreply.github.com>
@Jayclifford345
Jayclifford345 merged commit 797a196 into grafana:main Aug 19, 2025
80 checks passed
@lindhe
lindhe deleted the bloom-gateway-healthprobes branch August 19, 2025 12:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3 participants