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

feat: Add GCE Machine type as device attribute #244

Merged
gauravkghildiyal merged 1 commit into from
Sep 26, 2025
Merged

feat: Add GCE Machine type as device attribute #244

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
7 changes: 7 additions & 0 deletions pkg/cloudprovider/gce/gce.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"context"
"encoding/json"
"fmt"
"path"
"strings"
"time"

Expand Down Expand Up @@ -50,6 +51,7 @@ const (
AttrGCENetworkName = GCEAttrPrefix + "/" + "networkName"
AttrGCENetworkProjectNumber = GCEAttrPrefix + "/" + "networkProjectNumber"
AttrGCEIPAliases = GCEAttrPrefix + "/" + "ipAliases"
AttrGCEMachineType = GCEAttrPrefix + "/" + "machineType"
)

var (
Expand Down Expand Up @@ -87,6 +89,10 @@ func GetInstance(ctx context.Context) (*cloudprovider.CloudInstance, error) {
klog.Infof("could not get instance type on VM %s GCE ... retrying: %v", instanceName, err)
return false, nil
}
// Metadata server returns instanceType in the format
// "projects/{PROJECT_NUMBER}/machineTypes/{MACHINE_TYPE}". We only care
// about the specific name.
instanceType = path.Base(instanceType)

// curl "http://metadata.google.internal/computeMetadata/v1/instance/network-interfaces/?recursive=true" -H "Metadata-Flavor: Google"
// [{"accessConfigs":[{"externalIp":"35.225.164.134","type":"ONE_TO_ONE_NAT"}],"dnsServers":["169.254.169.254"],"forwardedIps":[],"gateway":"10.128.0.1","ip":"10.128.0.70","ipAliases":["10.24.3.0/24"],"mac":"42:01:0a:80:00:46","mtu":1460,"network":"projects/628944397724/networks/default","subnetmask":"255.255.240.0","targetInstanceIps":[]},{"accessConfigs":[{"externalIp":"","type":"ONE_TO_ONE_NAT"}],"dnsServers":["169.254.169.254"],"forwardedIps":[],"gateway":"192.168.1.1","ip":"192.168.1.2","ipAliases":[],"mac":"42:01:c0:a8:01:02","mtu":8244,"network":"projects/628944397724/networks/aojea-dra-net-1","subnetmask":"255.255.255.0","targetInstanceIps":[]},{"accessConfigs":[{"externalIp":"","type":"ONE_TO_ONE_NAT"}],"dnsServers":["169.254.169.254"],"forwardedIps":[],"gateway":"192.168.2.1","ip":"192.168.2.2","ipAliases":[],"mac":"42:01:c0:a8:02:02","mtu":8244,"network":"projects/628944397724/networks/aojea-dra-net-2","subnetmask":"255.255.255.0","targetInstanceIps":[]},{"accessConfigs":[{"externalIp":"","type":"ONE_TO_ONE_NAT"}],"dnsServers":["169.254.169.254"],"forwardedIps":[],"gateway":"192.168.3.1","ip":"192.168.3.2","ipAliases":[],"mac":"42:01:c0:a8:03:02","mtu":8244,"network":"projects/628944397724/networks/aojea-dra-net-3","subnetmask":"255.255.255.0","targetInstanceIps":[]},{"accessConfigs":[{"externalIp":"","type":"ONE_TO_ONE_NAT"}],"dnsServers":["169.254.169.254"],"forwardedIps":[],"gateway":"192.168.4.1","ip":"192.168.4.2","ipAliases":[],"mac":"42:01:c0:a8:04:02","mtu":8244,"network":"projects/628944397724/networks/aojea-dra-net-4","subnetmask":"255.255.255.0","targetInstanceIps":[]}]
Expand Down Expand Up @@ -128,6 +134,7 @@ func GetInstance(ctx context.Context) (*cloudprovider.CloudInstance, error) {
// identified by it's MAC.
func GetGCEAttributes(mac string, instance *cloudprovider.CloudInstance) map[resourceapi.QualifiedName]resourceapi.DeviceAttribute {
attributes := make(map[resourceapi.QualifiedName]resourceapi.DeviceAttribute)
attributes[AttrGCEMachineType] = resourceapi.DeviceAttribute{StringValue: &instance.Type}

topologyParts := strings.SplitN(strings.TrimPrefix(instance.Topology, "/"), "/", 3)
// topology may not be always available
Expand Down
26 changes: 21 additions & 5 deletions pkg/inventory/cloud_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,42 +45,51 @@ func TestGetProviderAttributes(t *testing.T) {
mac: "00:11:22:33:44:55",
instance: &cloudprovider.CloudInstance{
Provider: cloudprovider.CloudProviderGCE,
Type: "machine-type-a",
Interfaces: []cloudprovider.NetworkInterface{},
},
want: nil,
want: map[resourceapi.QualifiedName]resourceapi.DeviceAttribute{
gce.AttrGCEMachineType: {StringValue: ptr.To("machine-type-a")},
},
},
{
name: "MAC not found in instance interfaces, no topology",
mac: "00:11:22:33:44:FF", // MAC that won't be found
instance: &cloudprovider.CloudInstance{
Provider: cloudprovider.CloudProviderGCE,
Type: "machine-type-a",
Interfaces: []cloudprovider.NetworkInterface{
{Mac: "00:11:22:33:44:55", Network: "projects/12345/networks/test-network"},
},
},
want: nil,
want: map[resourceapi.QualifiedName]resourceapi.DeviceAttribute{
gce.AttrGCEMachineType: {StringValue: ptr.To("machine-type-a")},
},
},
{
name: "MAC not found in instance interfaces, has topology",
mac: "00:11:22:33:44:FF", // MAC that won't be found
instance: &cloudprovider.CloudInstance{
Provider: cloudprovider.CloudProviderGCE,
Type: "machine-type-a",
Interfaces: []cloudprovider.NetworkInterface{
{Mac: "00:11:22:33:44:55", Network: "projects/12345/networks/test-network"},
},
Topology: "/block/subblock/host",
},
want: map[resourceapi.QualifiedName]resourceapi.DeviceAttribute{
gce.AttrGCEBlock: {StringValue: ptr.To("block")},
gce.AttrGCESubBlock: {StringValue: ptr.To("subblock")},
gce.AttrGCEHost: {StringValue: ptr.To("host")},
gce.AttrGCEBlock: {StringValue: ptr.To("block")},
gce.AttrGCESubBlock: {StringValue: ptr.To("subblock")},
gce.AttrGCEHost: {StringValue: ptr.To("host")},
gce.AttrGCEMachineType: {StringValue: ptr.To("machine-type-a")},
},
},
{
name: "GCE provider, MAC found, valid network",
mac: "00:11:22:33:44:55",
instance: &cloudprovider.CloudInstance{
Provider: cloudprovider.CloudProviderGCE,
Type: "machine-type-a",
Interfaces: []cloudprovider.NetworkInterface{
{Mac: "00:11:22:33:44:55", Network: "projects/12345/networks/test-network"},
{Mac: "AA:BB:CC:DD:EE:FF", Network: "projects/67890/networks/other-network"},
Expand All @@ -93,13 +102,15 @@ func TestGetProviderAttributes(t *testing.T) {
gce.AttrGCEBlock: {StringValue: ptr.To("block")},
gce.AttrGCESubBlock: {StringValue: ptr.To("subblock")},
gce.AttrGCEHost: {StringValue: ptr.To("host")},
gce.AttrGCEMachineType: {StringValue: ptr.To("machine-type-a")},
},
},
{
name: "GCE provider, MAC found, invalid network string for GCE parsing",
mac: "00:11:22:33:44:55",
instance: &cloudprovider.CloudInstance{
Provider: cloudprovider.CloudProviderGCE,
Type: "machine-type-a",
Interfaces: []cloudprovider.NetworkInterface{
{Mac: "00:11:22:33:44:55", Network: "invalid-gce-network-string"},
},
Expand All @@ -111,6 +122,7 @@ func TestGetProviderAttributes(t *testing.T) {
mac: "00:11:22:33:44:55",
instance: &cloudprovider.CloudInstance{
Provider: cloudprovider.CloudProviderGCE,
Type: "machine-type-a",
Interfaces: []cloudprovider.NetworkInterface{
{Mac: "00:11:22:33:44:55", Network: "projects/12345/networks/test-network"},
{Mac: "AA:BB:CC:DD:EE:FF", Network: "projects/67890/networks/other-network"},
Expand All @@ -120,13 +132,15 @@ func TestGetProviderAttributes(t *testing.T) {
want: map[resourceapi.QualifiedName]resourceapi.DeviceAttribute{
gce.AttrGCENetworkName: {StringValue: ptr.To("test-network")},
gce.AttrGCENetworkProjectNumber: {IntValue: ptr.To(int64(12345))},
gce.AttrGCEMachineType: {StringValue: ptr.To("machine-type-a")},
},
},
{
name: "Unsupported provider, MAC found",
mac: "00:11:22:33:44:55",
instance: &cloudprovider.CloudInstance{
Provider: cloudprovider.CloudProviderAWS, // Unsupported provider
Type: "machine-type-a",
Interfaces: []cloudprovider.NetworkInterface{
{Mac: "00:11:22:33:44:55", Network: "aws-network-info"},
},
Expand All @@ -138,6 +152,7 @@ func TestGetProviderAttributes(t *testing.T) {
mac: "00:11:22:33:44:55",
instance: &cloudprovider.CloudInstance{
Provider: cloudprovider.CloudProviderGCE,
Type: "machine-type-a",
Interfaces: []cloudprovider.NetworkInterface{
{
Mac: "00:11:22:33:44:55",
Expand All @@ -150,6 +165,7 @@ func TestGetProviderAttributes(t *testing.T) {
gce.AttrGCENetworkName: {StringValue: ptr.To("test-network")},
gce.AttrGCENetworkProjectNumber: {IntValue: ptr.To(int64(12345))},
gce.AttrGCEIPAliases: {StringValue: ptr.To("10.0.0.1/24,10.0.0.2/24")},
gce.AttrGCEMachineType: {StringValue: ptr.To("machine-type-a")},
},
},
}
Expand Down
Loading