Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor metadata service access #385

Merged
merged 1 commit into from
Jul 14, 2021
Merged

Refactor metadata service access #385

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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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