-
Notifications
You must be signed in to change notification settings - Fork 3.4k
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(helm): Removed duplicate bucketNames from documentation and fixed key name deploymentMode
#12641
Conversation
@ddaskal Please note this item in the PR checklist and update the other files, and sign the contributor license agreement. |
deploymentMode
@JStickler I believe this is ready for review again. Do I need to squash my commits first or are you able to do a squash & merge? |
@ddaskal No need to squash, we squash and merge. I've already tagged someone who works on the Helm charts to review this (I'm the technical writer on the team, so I only approve doc updates and leave the code changes to the engineering team). |
deploymentMode
deploymentMode
deploymentMode
deploymentMode
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-12641-to-release-3.0.x origin/release-3.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 0d8ff9ee7929b8facbdb469abe344c320d3bd5ce When the conflicts are resolved, stage and commit the changes:
If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-12641-to-release-3.0.x
# Create the PR body template
PR_BODY=$(gh pr view 12641 --json body --template 'Backport 0d8ff9ee7929b8facbdb469abe344c320d3bd5ce from #12641{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'chore: [release-3.0.x] fix(helm): Removed duplicate bucketNames from documentation and fixed key name `deploymentMode`' --body-file - --label 'size/S' --label 'area/helm' --label 'type/docs' --label 'backport' --base release-3.0.x --milestone release-3.0.x --web Or, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-12641-to-release-3.0.x
# Create a pull request where the `base` branch is `release-3.0.x` and the `compare`/`head` branch is `backport-12641-to-release-3.0.x`.
# Remove the local backport branch
git switch main
git branch -D backport-12641-to-release-3.0.x |
… key name `deploymentMode` (grafana#12641) Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
What this PR does / why we need it:
Fixes documentation for Helm deployments to not have duplicate values and utilize correct
deploymentMode
key name.Which issue(s) this PR fixes:
Fixes #12610
Special notes for your reviewer:
Checklist
CONTRIBUTING.md
guide (required)docs/sources/setup/upgrade/_index.md
production/helm/loki/Chart.yaml
and updateproduction/helm/loki/CHANGELOG.md
andproduction/helm/loki/README.md
. Example PRdeprecated-config.yaml
anddeleted-config.yaml
files respectively in thetools/deprecated-config-checker
directory. Example PR