Skip to content

Delete cluster DNS config from DNS provider config #365

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

Merged
openshift-merge-robot merged 1 commit into from
Mar 10, 2020
Merged

Delete cluster DNS config from DNS provider config #365

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: 0 additions & 2 deletions cmd/ingress-operator/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ func createDNSProvider(cl client.Client, operatorConfig operatorconfig.Config, d
provider, err := awsdns.NewProvider(awsdns.Config{
AccessID: string(creds.Data["aws_access_key_id"]),
AccessKey: string(creds.Data["aws_secret_access_key"]),
DNS: dnsConfig,
Region: platformStatus.AWS.Region,
}, operatorConfig.OperatorReleaseVersion)
if err != nil {
Expand All @@ -251,7 +250,6 @@ func createDNSProvider(cl client.Client, operatorConfig operatorconfig.Config, d
ClientSecret: string(creds.Data["azure_client_secret"]),
TenantID: string(creds.Data["azure_tenant_id"]),
SubscriptionID: string(creds.Data["azure_subscription_id"]),
DNS: dnsConfig,
}, operatorConfig.OperatorReleaseVersion)
if err != nil {
return nil, fmt.Errorf("failed to create Azure DNS manager: %v", err)
Expand Down
2 changes: 0 additions & 2 deletions pkg/dns/aws/dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ type Config struct {
AccessKey string
// Region is the AWS region ELBs are created in.
Region string
// DNS is public and private DNS zone configuration for the cluster.
DNS *configv1.DNS
}

func NewProvider(config Config, operatorReleaseVersion string) (*Provider, error) {
Expand Down
2 changes: 0 additions & 2 deletions pkg/dns/azure/dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ type Config struct {
TenantID string
// SubscriptionID is the azure identity's subscription ID.
SubscriptionID string
// DNS is public and private DNS zone configuration for the cluster.
DNS *configv1.DNS
}

type provider struct {
Expand Down