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

Jump to bottom

[Digital Ocean] Code cleanup with no functional modifications #11592

Merged
merged 3 commits into from
Jun 1, 2021
Merged

[Digital Ocean] Code cleanup with no functional modifications #11592

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4cecc64
Move cloud.do from pkg/resources/digitalocean/ckoud.go to upup/pkg/fi…
srikiz May 14, 2021
b5154bb
Fix upup cloud.go dependencies based on the new interface spec, also …
srikiz May 28, 2021
4f295dc
Incorporate review comments
srikiz Jun 1, 2021
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
1 change: 0 additions & 1 deletion pkg/model/domodel/BUILD.bazel
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 2 additions & 10 deletions pkg/resources/digitalocean/BUILD.bazel
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 28 additions & 20 deletions pkg/resources/digitalocean/resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,13 @@ func ListResources(cloud do.DOCloud, clusterName string) (map[string]*resources.
return resourceTrackers, nil
}

func listDroplets(cloud do.DOCloud, clusterName string) ([]*resources.Resource, error) {
func listDroplets(cloud fi.Cloud, clusterName string) ([]*resources.Resource, error) {
c := cloud.(do.DOCloud)
var resourceTrackers []*resources.Resource

clusterTag := "KubernetesCluster:" + strings.Replace(clusterName, ".", "-", -1)

droplets, err := cloud.GetAllDropletsByTag(clusterTag)
droplets, err := c.GetAllDropletsByTag(clusterTag)
if err != nil {
return nil, fmt.Errorf("failed to list droplets: %v", err)
}
Expand All @@ -92,12 +93,13 @@ func listDroplets(cloud do.DOCloud, clusterName string) ([]*resources.Resource,
return resourceTrackers, nil
}

func listVolumes(cloud do.DOCloud, clusterName string) ([]*resources.Resource, error) {
func listVolumes(cloud fi.Cloud, clusterName string) ([]*resources.Resource, error) {
c := cloud.(do.DOCloud)
var resourceTrackers []*resources.Resource

volumeMatch := strings.Replace(clusterName, ".", "-", -1)

volumes, err := cloud.GetAllVolumesByRegion()
volumes, err := c.GetAllVolumesByRegion()
if err != nil {
return nil, fmt.Errorf("failed to list volumes: %s", err)
}
Expand Down Expand Up @@ -125,8 +127,9 @@ func listVolumes(cloud do.DOCloud, clusterName string) ([]*resources.Resource, e
return resourceTrackers, nil
}

func listDNS(cloud do.DOCloud, clusterName string) ([]*resources.Resource, error) {
domains, _, err := cloud.DomainService.List(context.TODO(), &godo.ListOptions{})
func listDNS(cloud fi.Cloud, clusterName string) ([]*resources.Resource, error) {
c := cloud.(do.DOCloud)
domains, _, err := c.DomainService().List(context.TODO(), &godo.ListOptions{})
if err != nil {
return nil, fmt.Errorf("failed to list domains: %s", err)
}
Expand Down Expand Up @@ -186,7 +189,7 @@ func getAllRecordsByDomain(cloud do.DOCloud, domain string) ([]godo.DomainRecord

opt := &godo.ListOptions{}
for {
records, resp, err := cloud.DomainService.Records(context.TODO(), domain, opt)
records, resp, err := cloud.DomainService().Records(context.TODO(), domain, opt)
if err != nil {
return nil, err
}
Expand All @@ -208,12 +211,13 @@ func getAllRecordsByDomain(cloud do.DOCloud, domain string) ([]godo.DomainRecord
return allRecords, nil
}

func listLoadBalancers(cloud do.DOCloud, clusterName string) ([]*resources.Resource, error) {
func listLoadBalancers(cloud fi.Cloud, clusterName string) ([]*resources.Resource, error) {
c := cloud.(do.DOCloud)
var resourceTrackers []*resources.Resource

clusterTag := "KubernetesCluster-Master:" + strings.Replace(clusterName, ".", "-", -1)

lbs, err := cloud.GetAllLoadBalancers()
lbs, err := c.GetAllLoadBalancers()
if err != nil {
return nil, fmt.Errorf("failed to list lbs: %v", err)
}
Expand Down Expand Up @@ -241,24 +245,26 @@ func listLoadBalancers(cloud do.DOCloud, clusterName string) ([]*resources.Resou
return resourceTrackers, nil
}

func deleteDroplet(cloud do.DOCloud, t *resources.Resource) error {
func deleteDroplet(cloud fi.Cloud, t *resources.Resource) error {
c := cloud.(do.DOCloud)
dropletID, err := strconv.Atoi(t.ID)
if err != nil {
return fmt.Errorf("failed to convert droplet ID to int: %s", err)
}

_, err = cloud.DropletsService().Delete(context.TODO(), dropletID)
_, err = c.DropletsService().Delete(context.TODO(), dropletID)
if err != nil {
return fmt.Errorf("failed to delete droplet: %d, err: %s", dropletID, err)
}

return nil
}

func deleteVolume(cloud do.DOCloud, t *resources.Resource) error {
func deleteVolume(cloud fi.Cloud, t *resources.Resource) error {
c := cloud.(do.DOCloud)
volume := t.Obj.(godo.Volume)
for _, dropletID := range volume.DropletIDs {
action, _, err := cloud.VolumeActionService().DetachByDropletID(context.TODO(), volume.ID, dropletID)
action, _, err := c.VolumeActionService().DetachByDropletID(context.TODO(), volume.ID, dropletID)
if err != nil {
return fmt.Errorf("failed to detach volume: %s, err: %s", volume.ID, err)
}
Expand All @@ -267,28 +273,30 @@ func deleteVolume(cloud do.DOCloud, t *resources.Resource) error {
}
}

_, err := cloud.VolumeService().DeleteVolume(context.TODO(), t.ID)
_, err := c.VolumeService().DeleteVolume(context.TODO(), t.ID)
if err != nil {
return fmt.Errorf("failed to delete volume: %s, err: %s", t.ID, err)
}

return nil
}

func deleteRecord(cloud do.DOCloud, domain string, t *resources.Resource) error {
func deleteRecord(cloud fi.Cloud, domain string, t *resources.Resource) error {
c := cloud.(do.DOCloud)
record := t.Obj.(godo.DomainRecord)

_, err := cloud.DomainService.DeleteRecord(context.TODO(), domain, record.ID)
_, err := c.DomainService().DeleteRecord(context.TODO(), domain, record.ID)
if err != nil {
return fmt.Errorf("failed to delete record for domain %s: %d", domain, record.ID)
}

return nil
}

func deleteLoadBalancer(cloud do.DOCloud, t *resources.Resource) error {
func deleteLoadBalancer(cloud fi.Cloud, t *resources.Resource) error {
c := cloud.(do.DOCloud)
lb := t.Obj.(godo.LoadBalancer)
_, err := cloud.LoadBalancersService.Delete(context.TODO(), lb.ID)
_, err := c.LoadBalancersService().Delete(context.TODO(), lb.ID)

if err != nil {
return fmt.Errorf("failed to delete load balancer with name %s %v", lb.Name, err)
Expand All @@ -297,7 +305,7 @@ func deleteLoadBalancer(cloud do.DOCloud, t *resources.Resource) error {
return nil
}

func waitForDetach(cloud *Cloud, action *godo.Action) error {
func waitForDetach(cloud do.DOCloud, action *godo.Action) error {
timeout := time.After(10 * time.Second)
ticker := time.NewTicker(500 * time.Millisecond)
defer ticker.Stop()
Expand All @@ -306,7 +314,7 @@ func waitForDetach(cloud *Cloud, action *godo.Action) error {
case <-timeout:
return errors.New("timed out waiting for volume to detach")
case <-ticker.C:
updatedAction, _, err := cloud.Client.Actions.Get(context.TODO(), action.ID)
updatedAction, _, err := cloud.ActionsService().Get(context.TODO(), action.ID)
if err != nil {
return err
}
Expand Down
1 change: 1 addition & 0 deletions pkg/resources/ops/BUILD.bazel
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pkg/resources/ops/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
cloudali "k8s.io/kops/upup/pkg/fi/cloudup/aliup"
"k8s.io/kops/upup/pkg/fi/cloudup/awsup"
cloudazure "k8s.io/kops/upup/pkg/fi/cloudup/azure"
clouddo "k8s.io/kops/upup/pkg/fi/cloudup/do"
cloudgce "k8s.io/kops/upup/pkg/fi/cloudup/gce"
cloudopenstack "k8s.io/kops/upup/pkg/fi/cloudup/openstack"
)
Expand All @@ -42,7 +43,7 @@ func ListResources(cloud fi.Cloud, cluster *kops.Cluster, region string) (map[st
case kops.CloudProviderAWS:
return aws.ListResourcesAWS(cloud.(awsup.AWSCloud), clusterName)
case kops.CloudProviderDO:
return digitalocean.ListResources(cloud.(*digitalocean.Cloud), clusterName)
return digitalocean.ListResources(cloud.(clouddo.DOCloud), clusterName)
case kops.CloudProviderGCE:
return gce.ListResourcesGCE(cloud.(cloudgce.GCECloud), clusterName, region)
case kops.CloudProviderOpenstack:
Expand Down
2 changes: 1 addition & 1 deletion protokube/pkg/gossip/do/BUILD.bazel
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions protokube/pkg/gossip/do/seeds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@ import (
"fmt"
"strings"

"github.com/digitalocean/godo"
"k8s.io/klog/v2"
"k8s.io/kops/pkg/resources/digitalocean"
"k8s.io/kops/protokube/pkg/gossip"
)

type SeedProvider struct {
cloud *digitalocean.Cloud
tag string
godoClient *godo.Client
tag string
}

var _ gossip.SeedProvider = &SeedProvider{}

func (p *SeedProvider) GetSeeds() ([]string, error) {
var seeds []string

droplets, _, err := p.cloud.Droplets().List(context.TODO(), nil)
droplets, _, err := p.godoClient.Droplets.List(context.TODO(), nil)

if err != nil {
return nil, fmt.Errorf("Droplets.ListByTag returned error: %v", err)
Expand Down Expand Up @@ -64,11 +64,11 @@ func (p *SeedProvider) GetSeeds() ([]string, error) {
return seeds, nil
}

func NewSeedProvider(cloud *digitalocean.Cloud, tag string) (*SeedProvider, error) {
func NewSeedProvider(godoClient *godo.Client, tag string) (*SeedProvider, error) {
klog.V(4).Infof("Trying new seed provider with cluster tag:%s", tag)

return &SeedProvider{
cloud: cloud,
tag: tag,
godoClient: godoClient,
tag: tag,
}, nil
}
2 changes: 1 addition & 1 deletion protokube/pkg/protokube/BUILD.bazel
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading