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: failed to reconrigure operation (#674) #6766

Conversation

@sophon-zt
Copy link
Contributor Author

/approve

@apecloud-bot apecloud-bot added the approved PR Approved Test label Mar 7, 2024
Copy link

codecov bot commented Mar 7, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 66.58%. Comparing base (20d29fa) to head (09cf788).
Report is 3 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6766      +/-   ##
==========================================
+ Coverage   66.52%   66.58%   +0.05%     
==========================================
  Files         308      308              
  Lines       36859    36864       +5     
==========================================
+ Hits        24521    24545      +24     
+ Misses      10251    10237      -14     
+ Partials     2087     2082       -5     
Flag Coverage Δ
unittests 66.58% <100.00%> (+0.05%) ⬆️

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.

@ahjing99 ahjing99 merged commit ae0adbe into main Mar 7, 2024
114 of 118 checks passed
@ahjing99 ahjing99 deleted the bugfix/ob-reconfigure-invalid-error-metadatalabels-invalid-value-__easy_memory_reserved_percentage-issue branch March 7, 2024 07:14
@github-actions github-actions bot added this to the Release 0.8.2 milestone Mar 7, 2024
@ahjing99
Copy link
Collaborator

ahjing99 commented Mar 7, 2024

/cherry-pick release-0.8

Copy link

github-actions bot commented Mar 7, 2024

🤖 says: Error cherry-picking.

Auto-merging controllers/apps/operations/reconfigure_util.go
CONFLICT (content): Merge conflict in controllers/apps/operations/reconfigure_util.go
Auto-merging pkg/configuration/core/config_util.go
error: could not apply ae0adbe... fix: failed to reconrigure operation (#674) (#6766)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

Copy link

github-actions bot commented Mar 7, 2024

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/apecloud/kubeblocks/actions/runs/8184337931

sophon-zt added a commit that referenced this pull request Mar 7, 2024
@sophon-zt
Copy link
Contributor Author

/cherry-pick release-0.8

Copy link

github-actions bot commented Mar 7, 2024

🤖 says: cherry pick action finished successfully 🎉!
See: https://github.com/apecloud/kubeblocks/actions/runs/8184602099

github-actions bot pushed a commit that referenced this pull request Mar 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved PR Approved Test enhancement size/L Denotes a PR that changes 100-499 lines.
Projects
None yet
5 participants