Skip to content
This repository was archived by the owner on May 6, 2026. It is now read-only.

refactor: Parse cloud instance topology only once #261

Merged
aojea merged 1 commit into from
Oct 17, 2025
Merged

refactor: Parse cloud instance topology only once #261

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
18 changes: 10 additions & 8 deletions pkg/cloudprovider/gce/gce.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,16 @@ func GetGCEAttributes(mac string, instance *cloudprovider.CloudInstance) map[res
attributes := make(map[resourceapi.QualifiedName]resourceapi.DeviceAttribute)
attributes[AttrGCEMachineType] = resourceapi.DeviceAttribute{StringValue: &instance.Type}

topologyParts := strings.SplitN(strings.TrimPrefix(instance.Topology, "/"), "/", 3)
Comment thread
gauravkghildiyal marked this conversation as resolved.
// topology may not be always available
if len(topologyParts) == 3 {
attributes[AttrGCEBlock] = resourceapi.DeviceAttribute{StringValue: &topologyParts[0]}
attributes[AttrGCESubBlock] = resourceapi.DeviceAttribute{StringValue: &topologyParts[1]}
attributes[AttrGCEHost] = resourceapi.DeviceAttribute{StringValue: &topologyParts[2]}
} else {
klog.Warningf("Error parsing host topology %q; it may be unsupported for the VM", instance.Topology)
if instance.Topology != "" {
topologyParts := strings.SplitN(strings.TrimPrefix(instance.Topology, "/"), "/", 3)
// topology may not be always available
if len(topologyParts) == 3 {
attributes[AttrGCEBlock] = resourceapi.DeviceAttribute{StringValue: &topologyParts[0]}
attributes[AttrGCESubBlock] = resourceapi.DeviceAttribute{StringValue: &topologyParts[1]}
attributes[AttrGCEHost] = resourceapi.DeviceAttribute{StringValue: &topologyParts[2]}
} else {
klog.Warningf("Error parsing host topology %q; it may be unsupported for the VM", instance.Topology)
}
}

// Determine properties specific to the device identified by this mac
Expand Down
Loading