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: Fix indentation of query range values in helm #12577

Merged
merged 1 commit into from
Jun 6, 2024

Conversation

coro
Copy link
Contributor

@coro coro commented Apr 11, 2024

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes issues mentioned in #12506 (comment)

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
@coro coro requested a review from a team as a code owner April 11, 2024 15:06
@CLAassistant
Copy link

CLAassistant commented Apr 11, 2024

CLA assistant check
All committers have signed the CLA.

@coro coro changed the title Fix query range helm Apr 11, 2024
@coro coro changed the title fix: Fix query range helm Apr 11, 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.

thanks for your contribution ❤️

could you please run make -C docs sources/setup/install/helm/reference.md and commit doc changes?

@github-actions github-actions bot added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Apr 12, 2024
@MichelHollands MichelHollands removed their request for review April 19, 2024 09:31
@DylanGuedes
Copy link
Contributor

DylanGuedes commented Apr 19, 2024

@coro I'm sorry, GH notifications are horrible and I didn't notice you had updated the PR, my bad. Could you do it one more time?

@coro
Copy link
Contributor Author

coro commented Apr 23, 2024

@DylanGuedes Here you. go, rebased and made it into 6.3.5.

@github-actions github-actions bot removed the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label May 1, 2024
@coro
Copy link
Contributor Author

coro commented May 1, 2024

@DylanGuedes I've again rebased onto 6.4.2. Have I misunderstood something about the chart's contribution process, or does every PR increment the chart version number as well? Seems like a race condition where I have to rebase my changes every time a different PR is merged before mine.

@JStickler
Copy link
Contributor

@coro Currently every PR increments the Helm version, but we're considering changing to weekly Helm updates and will be discussing that in this week's Community Call

@coro
Copy link
Contributor Author

coro commented May 3, 2024

That sounds like a positive change to me.

I've rebased again onto 6.5.0 - please can someone review this soon and merge? I would really like to not have to rebase this change a fourth time if possible. Thanks!

@Smuggla
Copy link

Smuggla commented Jun 6, 2024

Is there a timeline on this one line... preventing upgrades... @DylanGuedes @JStickler

@JStickler
Copy link
Contributor

@coro, apologies, I thought I could just update the version number and merge this, but instead I introduced merge conflicts. =(

@coro
Copy link
Contributor Author

coro commented Jun 6, 2024

@JStickler I've rebased again. I believe there was nothing else you wanted changing, but let me know otherwise / feel free to change.

@JStickler JStickler merged commit 9823f20 into grafana:main Jun 6, 2024
61 checks passed
@coro coro deleted the fix_query_range_helm branch June 7, 2024 08:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
5 participants