Skip to content

Commit d263c25

Browse files
committed
Update code for new SDK.
1 parent 0d508d1 commit d263c25

File tree

9 files changed

+324
-101
lines changed

9 files changed

+324
-101
lines changed

pkg/cloudprovider/providers/azure/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ go_library(
4444
"//pkg/volume:go_default_library",
4545
"//vendor/github.com/Azure/azure-sdk-for-go/arm/compute:go_default_library",
4646
"//vendor/github.com/Azure/azure-sdk-for-go/arm/disk:go_default_library",
47-
"//vendor/github.com/Azure/azure-sdk-for-go/arm/network:go_default_library",
4847
"//vendor/github.com/Azure/azure-sdk-for-go/arm/storage:go_default_library",
4948
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2017-12-01/compute:go_default_library",
49+
"//vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network:go_default_library",
5050
"//vendor/github.com/Azure/azure-sdk-for-go/storage:go_default_library",
5151
"//vendor/github.com/Azure/go-autorest/autorest:go_default_library",
5252
"//vendor/github.com/Azure/go-autorest/autorest/adal:go_default_library",
@@ -90,9 +90,9 @@ go_test(
9090
"//pkg/cloudprovider/providers/azure/auth:go_default_library",
9191
"//pkg/kubelet/apis:go_default_library",
9292
"//vendor/github.com/Azure/azure-sdk-for-go/arm/compute:go_default_library",
93-
"//vendor/github.com/Azure/azure-sdk-for-go/arm/network:go_default_library",
9493
"//vendor/github.com/Azure/azure-sdk-for-go/arm/storage:go_default_library",
9594
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2017-12-01/compute:go_default_library",
95+
"//vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network:go_default_library",
9696
"//vendor/github.com/Azure/go-autorest/autorest:go_default_library",
9797
"//vendor/github.com/Azure/go-autorest/autorest/to:go_default_library",
9898
"//vendor/github.com/stretchr/testify/assert:go_default_library",

pkg/cloudprovider/providers/azure/azure_backoff.go

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"net/http"
2222

2323
"github.com/Azure/azure-sdk-for-go/arm/compute"
24-
"github.com/Azure/azure-sdk-for-go/arm/network"
2524
computepreview "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2017-12-01/compute"
25+
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network"
2626
"github.com/Azure/go-autorest/autorest"
2727
"github.com/golang/glog"
2828

@@ -168,16 +168,18 @@ func (az *Cloud) CreateOrUpdateLBWithRetry(lb network.LoadBalancer) error {
168168
func (az *Cloud) ListLBWithRetry() ([]network.LoadBalancer, error) {
169169
allLBs := []network.LoadBalancer{}
170170
var result network.LoadBalancerListResult
171+
var resultPage LoadBalancerListResultPage
171172

172173
err := wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) {
173174
var retryErr error
174-
result, retryErr = az.LoadBalancerClient.List(az.ResourceGroup)
175+
resultPage, retryErr = az.LoadBalancerClient.List(az.ResourceGroup)
175176
if retryErr != nil {
176177
glog.Errorf("LoadBalancerClient.List(%v) - backoff: failure, will retry,err=%v",
177178
az.ResourceGroup,
178179
retryErr)
179180
return false, retryErr
180181
}
182+
result = resultPage.Response()
181183
glog.V(2).Infof("LoadBalancerClient.List(%v) - backoff: success", az.ResourceGroup)
182184
return true, nil
183185
})
@@ -194,13 +196,14 @@ func (az *Cloud) ListLBWithRetry() ([]network.LoadBalancer, error) {
194196
if result.NextLink != nil {
195197
err := wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) {
196198
var retryErr error
197-
result, retryErr = az.LoadBalancerClient.ListNextResults(az.ResourceGroup, result)
199+
resultPage, retryErr = az.LoadBalancerClient.ListNextResults(az.ResourceGroup, resultPage)
198200
if retryErr != nil {
199201
glog.Errorf("LoadBalancerClient.ListNextResults(%v) - backoff: failure, will retry,err=%v",
200202
az.ResourceGroup,
201203
retryErr)
202204
return false, retryErr
203205
}
206+
result = resultPage.Response()
204207
glog.V(2).Infof("LoadBalancerClient.ListNextResults(%v) - backoff: success", az.ResourceGroup)
205208
return true, nil
206209
})
@@ -218,15 +221,18 @@ func (az *Cloud) ListLBWithRetry() ([]network.LoadBalancer, error) {
218221
func (az *Cloud) ListPIPWithRetry(pipResourceGroup string) ([]network.PublicIPAddress, error) {
219222
allPIPs := []network.PublicIPAddress{}
220223
var result network.PublicIPAddressListResult
224+
var resultPage PublicIPAddressListResultPage
225+
221226
err := wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) {
222227
var retryErr error
223-
result, retryErr = az.PublicIPAddressesClient.List(pipResourceGroup)
228+
resultPage, retryErr = az.PublicIPAddressesClient.List(pipResourceGroup)
224229
if retryErr != nil {
225230
glog.Errorf("PublicIPAddressesClient.List(%v) - backoff: failure, will retry,err=%v",
226231
pipResourceGroup,
227232
retryErr)
228233
return false, retryErr
229234
}
235+
result = resultPage.Response()
230236
glog.V(2).Infof("PublicIPAddressesClient.List(%v) - backoff: success", pipResourceGroup)
231237
return true, nil
232238
})
@@ -243,13 +249,14 @@ func (az *Cloud) ListPIPWithRetry(pipResourceGroup string) ([]network.PublicIPAd
243249
if result.NextLink != nil {
244250
err := wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) {
245251
var retryErr error
246-
result, retryErr = az.PublicIPAddressesClient.ListNextResults(az.ResourceGroup, result)
252+
resultPage, retryErr = az.PublicIPAddressesClient.ListNextResults(az.ResourceGroup, resultPage)
247253
if retryErr != nil {
248254
glog.Errorf("PublicIPAddressesClient.ListNextResults(%v) - backoff: failure, will retry,err=%v",
249255
pipResourceGroup,
250256
retryErr)
251257
return false, retryErr
252258
}
259+
result = resultPage.Response()
253260
glog.V(2).Infof("PublicIPAddressesClient.ListNextResults(%v) - backoff: success", pipResourceGroup)
254261
return true, nil
255262
})

0 commit comments

Comments
 (0)