From 863b430ea6ce9b286918c87c2835b4170ab29d36 Mon Sep 17 00:00:00 2001 From: Nont Date: Tue, 24 Oct 2023 11:20:58 -0500 Subject: [PATCH] Fix azure client for multiple clouds --- pkg/monitor/worker.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/monitor/worker.go b/pkg/monitor/worker.go index 06e0dd7622b..b2d1df01200 100644 --- a/pkg/monitor/worker.go +++ b/pkg/monitor/worker.go @@ -10,6 +10,8 @@ import ( "sync" "time" + "github.com/Azure/azure-sdk-for-go/sdk/azcore" + "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2" "github.com/Azure/go-autorest/autorest/azure" "github.com/sirupsen/logrus" @@ -240,7 +242,10 @@ func (mon *monitor) newNSGMonitor(log *logrus.Entry, oc *api.OpenShiftCluster, s mon.clusterm.EmitGauge(nsg.MetricFailedNSGMonitorCreation, int64(1), dims) return &monitoring.NoOpMonitor{Wg: wg} } - client, err := armnetwork.NewSubnetsClient(subscriptionID, token, nil) + options := arm.ClientOptions{ + ClientOptions: azcore.ClientOptions{Cloud: mon.env.Environment().Cloud}, + } + client, err := armnetwork.NewSubnetsClient(subscriptionID, token, &options) if err != nil { log.Error("Unable to create the subnet client for NSG monitoring", err) mon.clusterm.EmitGauge(nsg.MetricFailedNSGMonitorCreation, int64(1), dims)