Merge pull request #11592 from srikiz/DO-Use-Interfaces

[Digital Ocean] Code cleanup with no functional modifications
kubernetes · Jun 1, 2021 · 91d8ffe · 91d8ffe
2 parents 373c37d + 4f295dc
commit 91d8ffe
Show file tree

Hide file tree

Showing 23 changed files with 793 additions and 642 deletions.
diff --git a/pkg/model/domodel/BUILD.bazel b/pkg/model/domodel/BUILD.bazel
diff --git a/pkg/model/domodel/droplets.go b/pkg/model/domodel/droplets.go
@@ -21,7 +21,6 @@ import (
 	"strings"
 
 	"k8s.io/kops/pkg/model"
-	"k8s.io/kops/pkg/resources/digitalocean"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/do"
 	"k8s.io/kops/upup/pkg/fi/cloudup/dotasks"
@@ -76,9 +75,9 @@ func (d *DropletBuilder) Build(c *fi.ModelBuilderContext) error {
 			clusterTagIndex := do.TagKubernetesClusterIndex + ":" + "etcd-" + strconv.Itoa(masterIndexCount)
 			droplet.Tags = append(droplet.Tags, clusterTagIndex)
 			droplet.Tags = append(droplet.Tags, clusterMasterTag)
-			droplet.Tags = append(droplet.Tags, digitalocean.TagKubernetesInstanceGroup+":"+ig.Name)
+			droplet.Tags = append(droplet.Tags, do.TagKubernetesInstanceGroup+":"+ig.Name)
 		} else {
-			droplet.Tags = append(droplet.Tags, digitalocean.TagKubernetesInstanceGroup+":"+ig.Name)
+			droplet.Tags = append(droplet.Tags, do.TagKubernetesInstanceGroup+":"+ig.Name)
 		}
 
 		userData, err := d.BootstrapScriptBuilder.ResourceNodeUp(c, ig)

diff --git a/pkg/resources/digitalocean/BUILD.bazel b/pkg/resources/digitalocean/BUILD.bazel