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(edas): scale will restart pod #718

Merged
merged 3 commits into from
Jun 29, 2021
Merged

fix(edas): scale will restart pod #718

merged 3 commits into from
Jun 29, 2021

Conversation

Muzry
Copy link
Contributor

@Muzry Muzry commented Jun 29, 2021

What type of this PR

Add one of the following kinds:
/kind bug

What this PR does / why we need it:

  • fix(edas): scale will restart pod

Which issue(s) this PR fixes:

  • Fixes #your-issue_number
  • [Erda Cloud Issue Link](paste your link here)

Specified Reviewers:

/assign #luobily

Need cherry-pick to release versions?

Add comment like /cherry-pick release/1.0 when this PR is merged.

For details on the cherry pick process, see the cherry pick requests section under CONTRIBUTING.md.

@codecov
Copy link

codecov bot commented Jun 29, 2021

Codecov Report

Merging #718 (9f0282b) into release/1.0 (4b04515) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           release/1.0    #718   +/-   ##
===========================================
  Coverage         9.35%   9.35%           
===========================================
  Files              996     996           
  Lines            90735   90735           
===========================================
  Hits              8488    8488           
  Misses           81356   81356           
  Partials           891     891           

@luobily
Copy link
Member

luobily commented Jun 29, 2021

/approve

@erda-bot erda-bot merged commit 9612272 into erda-project:release/1.0 Jun 29, 2021
@Muzry
Copy link
Contributor Author

Muzry commented Jun 29, 2021

/cherry-pick master

erda-bot added a commit to erda-bot/erda that referenced this pull request Jun 29, 2021
Co-authored-by: erda-bot <81558540+erda-bot@users.noreply.github.com>
@Muzry
Copy link
Contributor Author

Muzry commented Jun 29, 2021

/cherry-pick master

erda-bot added a commit to erda-bot/erda that referenced this pull request Jun 29, 2021
Co-authored-by: erda-bot <81558540+erda-bot@users.noreply.github.com>
@erda-bot
Copy link
Member

Automated cherry pick failed, please resolve the confilcts and create PR manually.
Details:

Auto-merging modules/scheduler/executor/plugins/edas/edas.go
[auto-cherry-pick-pr/718 39a301f5] fix(edas): scale will restart pod (#718)
 Author: Muzry <muzrry@gmail.com>
 Date: Tue Jun 29 17:33:56 2021 +0800
 1 file changed, 1 insertion(+), 1 deletion(-)

luobily pushed a commit that referenced this pull request Jun 30, 2021
Co-authored-by: erda-bot <81558540+erda-bot@users.noreply.github.com>

Co-authored-by: Muzry <muzrry@gmail.com>
Co-authored-by: 澄潭 <ztywto@qq.com>
Co-authored-by: luobily <lbl167612@alibaba-inc.com>
@Muzry Muzry deleted the edas_scale_fix branch July 15, 2021 02:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

None yet

3 participants