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

[DigitalOcean] Code refactor to use the existing dnsprovider package #12173

Merged
merged 3 commits into from
Aug 19, 2021
Merged

[DigitalOcean] Code refactor to use the existing dnsprovider package #12173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4143910
Fix DNS Provider package for DO
srikiz Aug 11, 2021
c399602
Minor changes for adding digitalocean plugin for dnsprovider
srikiz Aug 18, 2021
6e2bfb0
gazelle updates
srikiz Aug 18, 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
2 changes: 1 addition & 1 deletion dns-controller/cmd/dns-controller/BUILD.bazel
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion dns-controller/cmd/dns-controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import (
"k8s.io/kops/dns-controller/pkg/watchers"
"k8s.io/kops/dnsprovider/pkg/dnsprovider"
"k8s.io/kops/dnsprovider/pkg/dnsprovider/providers/aws/route53"
_ "k8s.io/kops/dnsprovider/pkg/dnsprovider/providers/do"
_ "k8s.io/kops/dnsprovider/pkg/dnsprovider/providers/google/clouddns"
_ "k8s.io/kops/pkg/resources/digitalocean/dns"
"k8s.io/kops/pkg/wellknownports"
"k8s.io/kops/protokube/pkg/gossip"
gossipdns "k8s.io/kops/protokube/pkg/gossip/dns"
Expand Down
2 changes: 1 addition & 1 deletion pkg/resources/digitalocean/dns/BUILD.bazel → .../pkg/dnsprovider/providers/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.

12 changes: 7 additions & 5 deletions pkg/resources/digitalocean/dns/dns.go → ...vider/pkg/dnsprovider/providers/do/dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,15 @@ import (
"k8s.io/kops/dnsprovider/pkg/dnsprovider/rrstype"
)

var _ dnsprovider.Interface = Interface{}

const (
ipPlaceholder = "203.0.113.123"
providerName = "digitalocean"
ProviderName = "digitalocean"
)

func init() {
dnsprovider.RegisterDNSProvider(providerName, func(config io.Reader) (dnsprovider.Interface, error) {
dnsprovider.RegisterDNSProvider(ProviderName, func(config io.Reader) (dnsprovider.Interface, error) {
client, err := newClient()
if err != nil {
return nil, err
Expand Down Expand Up @@ -77,17 +79,17 @@ func newClient() (*godo.Client, error) {
}

// DNS implements dnsprovider.Interface
type DNS struct {
type Interface struct {
client *godo.Client
}

// NewProvider returns an implementation of dnsprovider.Interface
func NewProvider(client *godo.Client) dnsprovider.Interface {
return &DNS{client: client}
return &Interface{client: client}
}

// Zones returns an implementation of dnsprovider.Zones
func (d *DNS) Zones() (dnsprovider.Zones, bool) {
func (d Interface) Zones() (dnsprovider.Zones, bool) {
return &zones{
client: d.client,
}, true
Expand Down
0 pkg/resources/digitalocean/dns/dns_test.go → .../pkg/dnsprovider/providers/do/dns_test.go
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions protokube/cmd/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.

1 change: 1 addition & 0 deletions protokube/cmd/protokube/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import (

// Load DNS plugins
_ "k8s.io/kops/dnsprovider/pkg/dnsprovider/providers/aws/route53"
_ "k8s.io/kops/dnsprovider/pkg/dnsprovider/providers/do"
_ "k8s.io/kops/dnsprovider/pkg/dnsprovider/providers/google/clouddns"
)

Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/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.

8 changes: 6 additions & 2 deletions upup/pkg/fi/cloudup/do/cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (
v1 "k8s.io/api/core/v1"
"k8s.io/klog/v2"
"k8s.io/kops/dnsprovider/pkg/dnsprovider"
dns "k8s.io/kops/dnsprovider/pkg/dnsprovider/providers/do"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/cloudinstances"
"k8s.io/kops/pkg/resources/digitalocean/dns"
"k8s.io/kops/protokube/pkg/etcd"
"k8s.io/kops/upup/pkg/fi"
)
Expand Down Expand Up @@ -183,7 +183,11 @@ func (c *doCloudImplementation) Region() string {
}

func (c *doCloudImplementation) DNS() (dnsprovider.Interface, error) {
return c.dns, nil
provider, err := dnsprovider.GetDnsProvider(dns.ProviderName, nil)
if err != nil {
return nil, fmt.Errorf("error building DNS provider: %v", err)
}
return provider, nil
}

// Volumes returns an implementation of godo.StorageService
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/do/mock_do_cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"github.com/digitalocean/godo"
v1 "k8s.io/api/core/v1"
"k8s.io/kops/dnsprovider/pkg/dnsprovider"
dns "k8s.io/kops/dnsprovider/pkg/dnsprovider/providers/do"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/cloudinstances"
"k8s.io/kops/pkg/resources/digitalocean/dns"
"k8s.io/kops/upup/pkg/fi"
)

Expand Down