Skip to content

Commit 8e6d85a

Browse files
committed
fix(azure) sovereign cloud support
Signed-off-by: jbpaux <[email protected]>
1 parent 5225d99 commit 8e6d85a

File tree

2 files changed

+26
-4
lines changed

2 files changed

+26
-4
lines changed

provider/azure/azure.go

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import (
2424

2525
log "github.com/sirupsen/logrus"
2626

27+
"github.com/Azure/azure-sdk-for-go/sdk/azcore"
28+
"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
2729
azcoreruntime "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
2830
"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
2931
dns "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/dns/armdns"
@@ -74,11 +76,20 @@ func NewAzureProvider(configFile string, domainFilter endpoint.DomainFilter, zon
7476
if err != nil {
7577
return nil, fmt.Errorf("failed to get credentials: %w", err)
7678
}
77-
zonesClient, err := dns.NewZonesClient(cfg.SubscriptionID, cred, nil)
79+
cloudCfg, err := getCloudConfiguration(cfg.Cloud)
80+
if err != nil {
81+
return nil, fmt.Errorf("failed to get cloud configuration: %w", err)
82+
}
83+
opts := &arm.ClientOptions{
84+
ClientOptions: azcore.ClientOptions{
85+
Cloud: cloudCfg,
86+
},
87+
}
88+
zonesClient, err := dns.NewZonesClient(cfg.SubscriptionID, cred, opts)
7889
if err != nil {
7990
return nil, err
8091
}
81-
recordSetsClient, err := dns.NewRecordSetsClient(cfg.SubscriptionID, cred, nil)
92+
recordSetsClient, err := dns.NewRecordSetsClient(cfg.SubscriptionID, cred, opts)
8293
if err != nil {
8394
return nil, err
8495
}

provider/azure/azure_private_dns.go

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import (
2222
"fmt"
2323
"strings"
2424

25+
"github.com/Azure/azure-sdk-for-go/sdk/azcore"
26+
"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
2527
azcoreruntime "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
2628
"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
2729
privatedns "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns"
@@ -68,11 +70,20 @@ func NewAzurePrivateDNSProvider(configFile string, domainFilter endpoint.DomainF
6870
if err != nil {
6971
return nil, fmt.Errorf("failed to get credentials: %w", err)
7072
}
71-
zonesClient, err := privatedns.NewPrivateZonesClient(cfg.SubscriptionID, cred, nil)
73+
cloudCfg, err := getCloudConfiguration(cfg.Cloud)
74+
if err != nil {
75+
return nil, fmt.Errorf("failed to get cloud configuration: %w", err)
76+
}
77+
opts := &arm.ClientOptions{
78+
ClientOptions: azcore.ClientOptions{
79+
Cloud: cloudCfg,
80+
},
81+
}
82+
zonesClient, err := privatedns.NewPrivateZonesClient(cfg.SubscriptionID, cred, opts)
7283
if err != nil {
7384
return nil, err
7485
}
75-
recordSetsClient, err := privatedns.NewRecordSetsClient(cfg.SubscriptionID, cred, nil)
86+
recordSetsClient, err := privatedns.NewRecordSetsClient(cfg.SubscriptionID, cred, opts)
7687
if err != nil {
7788
return nil, err
7889
}

0 commit comments

Comments
 (0)