openshift / machine-api-provider-aws Goto Github PK

The following branches are being fast-forwarded from the current development branch (main) as placeholders for future releases. No merging is allowed into these release branches until they are unfrozen for production release.

• release-4.17

For more information, see the branching documentation.

We are running infra and worker machinesets in multiple AWS accounts, in a single cluster, and we'd like to see the PROVIDERID, from the machine api, include the AWS account ID. Something like: aws://012345678910/us-west-1a/i-abc123

This would be helpful discerning machine account placement when exectuing oc -n openshift-machine-api get machines -o wide.

@kimba74 suggested updating the machine reconciler function setProviderID with the following snippet:

accountID := ""
if instance.NetworkInterfaces[0] != nil { 
        // Referencing instance.NetworkInterfaces[0] since all network interfaces have the same OwnerId
	accountID = aws.StringValue(instance.NetworkInterfaces[0].OwnerId)
}
providerID := fmt.Sprintf("aws://%s/%s/%s", accountID, availabilityZone, aws.StringValue(instance.InstanceId))

If there aren't any concerns, we can go ahead and submit this as PR.