Skip to content

Commit 73a2ca3

Browse files
committed
Remove circular definition of ProviderID
1 parent 8e3edd7 commit 73a2ca3

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

cloud/linode/instances.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func (i *instances) InstanceMetadata(ctx context.Context, node *v1.Node) (*cloud
9292

9393
// note that Zone is omitted as it's not a thing in Linode
9494
meta := &cloudprovider.InstanceMetadata{
95-
ProviderID: node.Spec.ProviderID, // TODO(okokes): this is circular... should we instead set it to a known prefix + linode.ID?
95+
ProviderID: fmt.Sprintf("%v%v", providerIDPrefix, linode.ID),
9696
NodeAddresses: addresses,
9797
InstanceType: linode.Type,
9898
Region: linode.Region,

cloud/linode/instances_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ func TestMetadataRetrieval(t *testing.T) {
144144

145145
meta, err := instances.InstanceMetadata(ctx, node)
146146
assert.NoError(t, err)
147+
assert.Equal(t, providerIDPrefix+strconv.Itoa(id), meta.ProviderID)
147148
assert.Equal(t, region, meta.Region)
148149
assert.Equal(t, linodeType, meta.InstanceType)
149150
assert.Equal(t, meta.NodeAddresses, []v1.NodeAddress{

0 commit comments

Comments
 (0)