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

docs: fix deployment mode in Helm example #13025

Merged
merged 3 commits into from
May 28, 2024
Merged

Conversation

JStickler
Copy link
Contributor

@JStickler JStickler commented May 23, 2024

What this PR does / why we need it:

Fixes issue reported via docs @ grafana email.

This update was already made in main as part of #12641 but needs to be published to 3.0.

@JStickler JStickler added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label May 23, 2024
@JStickler JStickler requested a review from a team as a code owner May 23, 2024 16:06
Copy link
Collaborator

@paul1r paul1r left a comment

Choose a reason for hiding this comment

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

deploymentMode

@JStickler JStickler merged commit 876d9ba into release-3.0.x May 28, 2024
52 checks passed
@JStickler JStickler deleted the helmDeploymentMode branch May 28, 2024 17:26
@grafanabot
Copy link
Collaborator

The backport to release-3.0.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-13025-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 876d9bae21088568a1e4018e15aec23377f0912d

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-13025-to-release-3.0.x
# Create the PR body template
PR_BODY=$(gh pr view 13025 --json body --template 'Backport 876d9bae21088568a1e4018e15aec23377f0912d from #13025{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'chore: [release-3.0.x] docs: fix deployment mode in Helm example' --body-file - --label 'size/XS' --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-13025-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-13025-to-release-3.0.x`.

# Remove the local backport branch
git switch main
git branch -D backport-13025-to-release-3.0.x

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-failed size/XS 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