Skip to content

Commit

Permalink
Refactor metadata service access
Browse files Browse the repository at this point in the history
Only pull the metadata that is needed.
  • Loading branch information
gottwald committed Jul 14, 2021
1 parent db266f4 commit 9f1dd7e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

* Update Kubernetes dependency to 1.20.2
[[GH-374]](https://github.com/digitalocean/csi-digitalocean/pull/374)
* Refactor metadata service access
[[GH-385]](https://github.com/digitalocean/csi-digitalocean/pull/385)

## v2.1.1 - 2020.10.30

Expand Down
15 changes: 9 additions & 6 deletions driver/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,19 @@ func NewDriver(ep, token, url, region, doTag, driverName, debugAddr string) (*Dr
})
oauthClient := oauth2.NewClient(context.Background(), tokenSource)

var hostID string
mdClient := metadata.NewClient()
if region == "" {
all, err := metadata.NewClient().Metadata()
var err error
region, err = mdClient.Region()
if err != nil {
return nil, fmt.Errorf("couldn't get metadata: %s (are you running outside of a DigitalOcean droplet and possibly forgot to specify the 'region' flag?)", err)
return nil, fmt.Errorf("couldn't get region from metadata: %s (are you running outside of a DigitalOcean droplet and possibly forgot to specify the 'region' flag?)", err)
}

region = all.Region
hostID = strconv.Itoa(all.DropletID)
}
hostIDInt, err := mdClient.DropletID()
if err != nil {
return nil, fmt.Errorf("couldn't get droplet ID from metadata: %s (are you running outside of a DigitalOcean droplet?)", err)
}
hostID := strconv.Itoa(hostIDInt)

opts := []godo.ClientOpt{}
opts = append(opts, godo.SetBaseURL(url))
Expand Down

0 comments on commit 9f1dd7e

Please sign in to comment.