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 example deployment #1705

Merged
merged 1 commit into from
Feb 27, 2025
Merged

Fix example deployment #1705

merged 1 commit into from
Feb 27, 2025

Conversation

mariomac
Copy link
Contributor

The goblog image was updated with some fixes, but it added a breaking change that caused the K8s deployment example to crash.

Copy link
Contributor

This PR must be merged before a backport PR will be created.

1 similar comment
Copy link
Contributor

This PR must be merged before a backport PR will be created.

Copy link

codecov bot commented Feb 27, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 69.81%. Comparing base (2ded441) to head (dcd09dc).
Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1705      +/-   ##
==========================================
+ Coverage   67.34%   69.81%   +2.47%     
==========================================
  Files         209      209              
  Lines       21065    21065              
==========================================
+ Hits        14186    14707     +521     
+ Misses       6144     5644     -500     
+ Partials      735      714      -21     
Flag Coverage Δ
integration-test 54.42% <ø> (?)
k8s-integration-test 54.40% <ø> (-0.06%) ⬇️
oats-test 35.08% <ø> (-0.02%) ⬇️
unittests 46.24% <ø> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mariomac mariomac merged commit 837114e into grafana:main Feb 27, 2025
17 checks passed
github-actions bot pushed a commit that referenced this pull request Feb 27, 2025
(cherry picked from commit 837114e)
Copy link
Contributor

The backport to release-2.0 failed:

Validation Failed: "Could not resolve to a node with the global id of 'T_kwDOAG3Mbc4AssrW'."

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-1705-to-release-2.0 origin/release-2.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 837114ec4a693af2f02e6278420a29f1de59bfdb

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-1705-to-release-2.0
# Create the PR body template
PR_BODY=$(gh pr view 1705 --json body --template 'Backport 837114ec4a693af2f02e6278420a29f1de59bfdb from #1705{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-2.0] Fix example deployment' --body-file - --label 'type/docs' --label 'backport' --base release-2.0 --milestone release-2.0 --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-1705-to-release-2.0

# Create a pull request where the `base` branch is `release-2.0` and the `compare`/`head` branch is `backport-1705-to-release-2.0`.

# Remove the local backport branch
git switch main
git branch -D backport-1705-to-release-2.0

@mariomac mariomac deleted the doc-fix-deployment branch February 27, 2025 13:55
marctc pushed a commit that referenced this pull request Feb 27, 2025
(cherry picked from commit 837114e)

Co-authored-by: Mario Macias <[email protected]>
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.

2 participants