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.

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

chore: Allow setting annotations for memberlist and query-scheduler-discovery services #14211

Merged
merged 8 commits into from
Sep 26, 2024

Conversation

tabboud
Copy link
Contributor

@tabboud tabboud commented Sep 20, 2024

What this PR does / why we need it:
Both the memberlist and query-scheduler-discovery services do not provide a way to add annotations.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

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

@tabboud tabboud requested a review from a team as a code owner September 20, 2024 17:48
@CLAassistant
Copy link

CLAassistant commented Sep 20, 2024

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot added area/helm type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories labels Sep 20, 2024
{{- with .Values.loki.serviceAnnotations }}
{{- toYaml . | nindent 4}}
{{- end }}
{{- with .Values.backend.service.annotations }}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The query-scheduler-discovery service is not technically the backend service, but given it's deployed along with it and currently uses the backendSelectorLabels, this seems appropriate to add these annotations as well.

Copy link
Contributor

Choose a reason for hiding this comment

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

yep that looks correct.

@slim-bean slim-bean changed the title Helm: Allow setting annotations for memberlist and query-scheduler-discovery services chore: Allow setting annotations for memberlist and query-scheduler-discovery services Sep 23, 2024
@pull-request-size pull-request-size bot added size/S and removed size/M labels Sep 25, 2024
Copy link
Contributor

@DylanGuedes DylanGuedes left a comment

Choose a reason for hiding this comment

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

LGTM, could you just:

  • Release 6.15.0 with this by fixing the changelog and the other files listed on the PR checklist
  • Or, in case you don't want to see a new release just with this change, to move the entry on the changelog to a new UNRELEASED section

production/helm/loki/CHANGELOG.md Show resolved Hide resolved
{{- with .Values.loki.serviceAnnotations }}
{{- toYaml . | nindent 4}}
{{- end }}
{{- with .Values.backend.service.annotations }}
Copy link
Contributor

Choose a reason for hiding this comment

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

yep that looks correct.

@pull-request-size pull-request-size bot added size/M and removed size/S labels Sep 25, 2024
@tabboud
Copy link
Contributor Author

tabboud commented Sep 25, 2024

@DylanGuedes Thanks for the review.

I updated the relevant files for the new 6.15.0 release and have merged in main so this should be good for another pass through.

@DylanGuedes DylanGuedes merged commit c899316 into grafana:main Sep 26, 2024
66 checks passed
jeschkies pushed a commit to jeschkies/loki that referenced this pull request Oct 1, 2024
…iscovery services (grafana#14211)

**What this PR does / why we need it**:
Both the memberlist and query-scheduler-discovery services do not provide a way to add annotations.
mraboosk pushed a commit to mraboosk/loki that referenced this pull request Oct 7, 2024
…iscovery services (grafana#14211)

**What this PR does / why we need it**:
Both the memberlist and query-scheduler-discovery services do not provide a way to add annotations.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/helm size/M type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants