Skip to content

fix(helm): admin-api should only be deployed in microservice mode - #13655

Merged
JStickler merged 13 commits into
grafana:mainfrom
bradleypettit:main
Sep 3, 2025
Merged

fix(helm): admin-api should only be deployed in microservice mode#13655
JStickler merged 13 commits into
grafana:mainfrom
bradleypettit:main

Conversation

@bradleypettit

@bradleypettit bradleypettit commented Jul 25, 2024

Copy link
Copy Markdown
Contributor

What this PR does / why we need it:
Enterprise deployments using SSD are expected to use the admin-api service within the backend pods. After the helm chart received support for microservice mode, a seperate admin-api deployment is created in both SSD and Microservice modes.

Which issue(s) this PR fixes:
n/a

Special notes for your reviewer:
n/a

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
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • 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
Signed-off-by: Bradley Pettit <12028233+bradleypettit@users.noreply.github.com>
@bradleypettit
bradleypettit requested a review from a team as a code owner July 25, 2024 01:27
Signed-off-by: Bradley Pettit <12028233+bradleypettit@users.noreply.github.com>
Signed-off-by: Bradley Pettit <12028233+bradleypettit@users.noreply.github.com>
Signed-off-by: Bradley <12028233+bradleypettit@users.noreply.github.com>
Signed-off-by: Bradley <12028233+bradleypettit@users.noreply.github.com>
@QuentinBisson

Copy link
Copy Markdown
Contributor

At first glance it looks good to me

@QuentinBisson

Copy link
Copy Markdown
Contributor

@bradleypettit do you mind fixing the conflicts?

Signed-off-by: Bradley <12028233+bradleypettit@users.noreply.github.com>
@bradleypettit

Copy link
Copy Markdown
Contributor Author

Thanks @QuentinBisson - conflicts resolved and re-tested OK in my lab environment.

@QuentinBisson

QuentinBisson commented Sep 1, 2025

Copy link
Copy Markdown
Contributor

@Jayclifford345 could you take care of this one? 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: J Stickler <julie.stickler@grafana.com>
@JStickler
JStickler merged commit 51d710f into grafana:main Sep 3, 2025
79 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

4 participants