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

fix: Fixes read & backend replicas settings #12828

Merged
merged 7 commits into from
Apr 30, 2024

Conversation

thorker
Copy link
Contributor

@thorker thorker commented Apr 30, 2024

What this PR does / why we need it:
Fixes incorrect configuration of read & backend replicas
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
  • 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: thorker <th.kerber+github@gmail.com>
@thorker thorker requested a review from a team as a code owner April 30, 2024 09:03
@CLAassistant
Copy link

CLAassistant commented Apr 30, 2024

CLA assistant check
All committers have signed the CLA.

@@ -23,7 +23,7 @@ spec:
{{- if eq .Values.deploymentMode "SingleBinary" }}
replicas: 0
{{- else }}
replicas: {{ .Values.write.replicas }}
replicas: {{ .Values.backend.replicas }}
Copy link
Contributor

Choose a reason for hiding this comment

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

4 lines above this still says if not .Values.write.autoscaling.enabled. Shouldn't that use backend as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point

@@ -23,7 +23,7 @@ spec:
{{- if eq .Values.deploymentMode "SingleBinary" }}
replicas: 0
{{- else }}
replicas: {{ .Values.write.replicas }}
replicas: {{ .Values.read.replicas }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here

@@ -3,7 +3,7 @@ name: loki
description: Helm chart for Grafana Loki in simple, scalable mode
type: application
appVersion: 3.0.0
version: 6.3.4
version: 6.3.5
Copy link
Contributor

Choose a reason for hiding this comment

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

The latest version is 6.4 now. Please use 6.4.1. And also please update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thought README & CHANGELOG will be generated via CI Pipeline or did I missed sth?

Copy link
Contributor

Choose a reason for hiding this comment

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

Not for the Helm charts at the moment so they have to be updated by hand.

Signed-off-by: thorker <th.kerber+github@gmail.com>
thorker and others added 5 commits April 30, 2024 12:42
# Conflicts:
#	production/helm/loki/Chart.yaml
Signed-off-by: thorker <th.kerber+github@gmail.com>

Signed-off-by: thorker <th.kerber+github@gmail.com>
Signed-off-by: thorker <th.kerber+github@gmail.com>

Signed-off-by: thorker <th.kerber+github@gmail.com>
@MichelHollands MichelHollands merged commit d751134 into grafana:main Apr 30, 2024
61 checks passed
@thorker thorker deleted the thorker/fix-replicas branch April 30, 2024 12:14
shantanualsi pushed a commit that referenced this pull request May 6, 2024
Signed-off-by: thorker <th.kerber+github@gmail.com>
Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
mraboosk pushed a commit to mraboosk/loki that referenced this pull request Oct 7, 2024
Signed-off-by: thorker <th.kerber+github@gmail.com>
Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
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.

3 participants