Skip to content

fix: use targeted patch in calcSubnetStatusIP to prevent U2O status overwrite #6350

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
oilbeater merged 1 commit into from
Feb 26, 2026
Merged

fix: use targeted patch in calcSubnetStatusIP to prevent U2O status overwrite #6350

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
25 changes: 24 additions & 1 deletion pkg/controller/subnet_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,30 @@ func (c *Controller) calcSubnetStatusIP(subnet *kubeovnv1.Subnet) (*kubeovnv1.Su
subnet.Status.V6UsingIPRange = v6UsingIPStr
subnet.Status.V4AvailableIPRange = v4AvailableIPStr
subnet.Status.V6AvailableIPRange = v6AvailableIPStr
bytes, err := subnet.Status.Bytes()

// Use a targeted patch with only IP-related fields to avoid overwriting
// non-IP status fields (e.g., U2OInterconnectionVPC) set by other handlers.
ipStatusPatch := struct {
Status struct {
V4AvailableIPs float64 `json:"v4availableIPs"`
V4AvailableIPRange string `json:"v4availableIPrange"`
V4UsingIPs float64 `json:"v4usingIPs"`
V4UsingIPRange string `json:"v4usingIPrange"`
V6AvailableIPs float64 `json:"v6availableIPs"`
V6AvailableIPRange string `json:"v6availableIPrange"`
V6UsingIPs float64 `json:"v6usingIPs"`
V6UsingIPRange string `json:"v6usingIPrange"`
} `json:"status"`
}{}
ipStatusPatch.Status.V4AvailableIPs = v4availableIPs
ipStatusPatch.Status.V4AvailableIPRange = v4AvailableIPStr
ipStatusPatch.Status.V4UsingIPs = v4UsingIPs
ipStatusPatch.Status.V4UsingIPRange = v4UsingIPStr
ipStatusPatch.Status.V6AvailableIPs = v6availableIPs
ipStatusPatch.Status.V6AvailableIPRange = v6AvailableIPStr
ipStatusPatch.Status.V6UsingIPs = v6UsingIPs
ipStatusPatch.Status.V6UsingIPRange = v6UsingIPStr
Comment on lines +248 to +267
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot Feb 26, 2026

Choose a reason for hiding this comment

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

medium

While the use of a struct to create the patch is type-safe, it's a bit verbose. For improved readability and conciseness, you could consider using a map[string]any to construct the patch payload. This is a common pattern for creating JSON patches and avoids the lengthy struct definition and separate field assignments.

Suggested change
ipStatusPatch := struct {
Status struct {
V4AvailableIPs float64 `json:"v4availableIPs"`
V4AvailableIPRange string `json:"v4availableIPrange"`
V4UsingIPs float64 `json:"v4usingIPs"`
V4UsingIPRange string `json:"v4usingIPrange"`
V6AvailableIPs float64 `json:"v6availableIPs"`
V6AvailableIPRange string `json:"v6availableIPrange"`
V6UsingIPs float64 `json:"v6usingIPs"`
V6UsingIPRange string `json:"v6usingIPrange"`
} `json:"status"`
}{}
ipStatusPatch.Status.V4AvailableIPs = v4availableIPs
ipStatusPatch.Status.V4AvailableIPRange = v4AvailableIPStr
ipStatusPatch.Status.V4UsingIPs = v4UsingIPs
ipStatusPatch.Status.V4UsingIPRange = v4UsingIPStr
ipStatusPatch.Status.V6AvailableIPs = v6availableIPs
ipStatusPatch.Status.V6AvailableIPRange = v6AvailableIPStr
ipStatusPatch.Status.V6UsingIPs = v6UsingIPs
ipStatusPatch.Status.V6UsingIPRange = v6UsingIPStr
ipStatusPatch := map[string]any{
"status": map[string]any{
"v4availableIPs": v4availableIPs,
"v4availableIPrange": v4AvailableIPStr,
"v4usingIPs": v4UsingIPs,
"v4usingIPrange": v4UsingIPStr,
"v6availableIPs": v6availableIPs,
"v6availableIPrange": v6AvailableIPStr,
"v6usingIPs": v6UsingIPs,
"v6usingIPrange": v6UsingIPStr,
},
}

bytes, err := json.Marshal(ipStatusPatch)
if err != nil {
klog.Error(err)
return nil, err
Expand Down
Loading