Skip to content

Automated cherry pick of #1554: fix(mcp-server): support mcp-server-ee #1555

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.

Sign up for GitHub

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

Merged
zexi merged 1 commit into from
Jul 20, 2026
Merged

Automated cherry pick of #1554: fix(mcp-server): support mcp-server-ee #1555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkg/apis/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ const (

RegionCEImageName = "region"
RegionEEImageName = "region-ee"

McpServerCEImageName = "mcp-server"
McpServerEEImageName = "mcp-server-ee"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/onecloud/v1alpha1/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ func SetDefaults_OnecloudClusterSpec(obj *OnecloudClusterSpec, isEE bool, isEEOr
ExtdbComponentType: nHP(&obj.Extdb.DeploymentSpec, useHyperImage),
BillingComponentType: nHP(&obj.Billing.DeploymentSpec, useHyperImage),
LLMComponentType: nHP(&obj.LLM.DeploymentSpec, useHyperImage),
McpServerComponentType: nHP(&obj.McpServer.DeploymentSpec, useHyperImage),
AiProxyComponentType: nHP(&obj.AiProxy.DeploymentSpec, useHyperImage),
} {
SetDefaults_DeploymentSpec(spec.DeploymentSpec, getImage(
Expand All @@ -230,8 +229,9 @@ func SetDefaults_OnecloudClusterSpec(obj *OnecloudClusterSpec, isEE bool, isEEOr

// CE or EE parts
for cType, spec := range map[ComponentType]*hyperImagePair{
CloudmuxComponentType: nHP(obj.Cloudmux.ToDeploymentSpec(), false),
CloudmonComponentType: nHP(&obj.Cloudmon.DeploymentSpec, useHyperImage),
CloudmuxComponentType: nHP(obj.Cloudmux.ToDeploymentSpec(), false),
CloudmonComponentType: nHP(&obj.Cloudmon.DeploymentSpec, useHyperImage),
McpServerComponentType: nHP(&obj.McpServer.DeploymentSpec, useHyperImage),
} {
SetDefaults_DeploymentSpec(spec.DeploymentSpec,
getEditionImage(
Expand Down
6 changes: 6 additions & 0 deletions pkg/manager/component/mcp-server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ func (m *mcpServerManager) GetServiceName() string {
}

func (m *mcpServerManager) Sync(oc *v1alpha1.OnecloudCluster) error {
isEE := IsEnterpriseEdition(oc)
imageName := oc.Spec.McpServer.ImageName
// 版本在 CE/EE 间切换时清空 ImageName，让 defaults 按 edition 重新选 mcp-server / mcp-server-ee
if (imageName == constants.McpServerCEImageName && isEE) || (imageName == constants.McpServerEEImageName && !isEE) {
oc.Spec.McpServer.ImageName = ""
}
return syncComponent(m, oc, "")
}

Expand Down
Loading