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

Add name labels and modify runtime cfg name #12291

Merged
merged 1 commit into from
Mar 21, 2024

Conversation

DylanGuedes
Copy link
Contributor

What this PR does / why we need it:

  • Adds name label to all components (ingesters already have this)
  • Modify the runtime config to not use fullName (the other components only use name)

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • CHANGELOG.md updated
    • If the change is worth mentioning in the release notes, add add-to-release-notes label
  • 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

@DylanGuedes DylanGuedes requested a review from a team as a code owner March 21, 2024 10:55
@DylanGuedes DylanGuedes changed the title Add name labels Add name labels and modify runtime cfg name Mar 21, 2024
@@ -184,7 +184,7 @@ spec:
{{- include "loki.configVolume" . | nindent 10 }}
- name: runtime-config
configMap:
name: {{ template "loki.fullname" . }}-runtime
name: {{ template "loki.name" . }}-runtime
Copy link
Contributor

Choose a reason for hiding this comment

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

The configmap creation isn't updated as far as I can see. So how will this match that?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

that's the issue - the configmap name is actually {{ template "loki.name" . }}-runtime. We'd have to either, modify it to be .fullname and update the other places to use .fullname, or just change these few pieces to stay as .name

Copy link
Collaborator

Choose a reason for hiding this comment

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

it looks like the runtime configmap is created with loki.name already?

Copy link
Contributor

Choose a reason for hiding this comment

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

Got it, thanks

Copy link
Contributor

@MichelHollands MichelHollands left a comment

Choose a reason for hiding this comment

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

LGTM

@slim-bean slim-bean merged commit 38d8b62 into ewelch-distributed-helm-chart Mar 21, 2024
8 of 12 checks passed
@slim-bean slim-bean deleted the change-runtimeconfig branch March 21, 2024 13:37
DylanGuedes added a commit that referenced this pull request Mar 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants