Skip to content

fix(msp): preserve nacos dependency for mse clusters#6786

Open
luobily wants to merge 1 commit into
erda-project:masterfrom
luobily:codex/fix-mse-nacos-tenant-id
Open

fix(msp): preserve nacos dependency for mse clusters#6786
luobily wants to merge 1 commit into
erda-project:masterfrom
luobily:codex/fix-mse-nacos-tenant-id

Conversation

@luobily

@luobily luobily commented Jun 29, 2026

Copy link
Copy Markdown
Member

What this PR does / why we need it:

Which issue(s) this PR fixes:

Specified Reviewers:

/assign @your-reviewer

ChangeLog

Language Changelog
🇺🇸 English 去掉 mse-nacos 的无用分支逻辑
🇨🇳 中文 fix(msp): preserve nacos dependency for mse clusters

Need cherry-pick to release versions?

@erda-bot erda-bot added bugfix msp microsevice platform labels Jun 29, 2026

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2f670aa3d9

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

handlers.MseNacosPort: "8848",
})

if _, ok := info.Dice.AddOns[handlers.ResourceNacos]; !ok {

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Avoid deploying Nacos child add-ons on MSE

When an MSE cluster has MS_NACOS_* and config-center/registercenter needs a new Nacos tenant, preserving the raw nacos add-on sends the recursive deploy through the normal Nacos handler. The coordinator resolves that handler's dice add-ons before checking CheckIfHasCustomConfig (coordinator.go:123-180), and the Nacos handler is wired to consume MySQL subresource output (nacos.go:60-65), so the first tenant path can create an unused MySQL dependency/tenant before switching to the external MSE Nacos. The same expectation is mirrored in the registercenter test; please strip Nacos child add-ons for the MSE custom path or otherwise keep tenant creation without deploying Nacos's internal dependencies.

Useful? React with 👍 / 👎.

@codecov

codecov Bot commented Jun 29, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 35.29412% with 11 lines in your changes missing coverage. Please review.
✅ Project coverage is 15.84%. Comparing base (705dd82) to head (117a892).

Files with missing lines Patch % Lines
...pps/msp/resource/deploy/coordinator/coordinator.go 40.00% 9 Missing ⚠️
...l/apps/msp/resource/deploy/handlers/nacos/nacos.go 0.00% 2 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6786      +/-   ##
==========================================
+ Coverage   15.82%   15.84%   +0.01%     
==========================================
  Files        3998     3998              
  Lines      328179   328165      -14     
==========================================
+ Hits        51933    51983      +50     
+ Misses     270350   270281      -69     
- Partials     5896     5901       +5     
Flag Coverage Δ
by-github-actions 15.84% <35.29%> (+0.01%) ⬆️

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

Files with missing lines Coverage Δ
...ource/deploy/handlers/configcenter/configcenter.go 0.00% <ø> (ø)
...e/deploy/handlers/registercenter/registercenter.go 0.00% <ø> (ø)
...l/apps/msp/resource/deploy/handlers/nacos/nacos.go 0.00% <0.00%> (ø)
...pps/msp/resource/deploy/coordinator/coordinator.go 7.36% <40.00%> (+3.99%) ⬆️

... and 5 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@luobily luobily force-pushed the codex/fix-mse-nacos-tenant-id branch from 2f670aa to 4c3ea49 Compare June 29, 2026 07:28
@luobily luobily changed the title fix(msp): preserve nacos dependency for mse clusters [WIP]fix(msp): preserve nacos dependency for mse clusters Jul 1, 2026
@luobily luobily force-pushed the codex/fix-mse-nacos-tenant-id branch from 4c3ea49 to 117a892 Compare July 2, 2026 06:04
@luobily luobily changed the title [WIP]fix(msp): preserve nacos dependency for mse clusters fix(msp): preserve nacos dependency for mse clusters Jul 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugfix msp microsevice platform

Development

Successfully merging this pull request may close these issues.

2 participants