From 9f26becae14f867a3c1b097e4b168bef4fbcd739 Mon Sep 17 00:00:00 2001 From: chshou Date: Sat, 21 Oct 2017 10:47:29 -0700 Subject: [PATCH] get rg inside 'ensure' methods --- pkg/cloudprovider/providers/azure/azure_backoff.go | 6 +++--- pkg/cloudprovider/providers/azure/azure_loadbalancer.go | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/cloudprovider/providers/azure/azure_backoff.go b/pkg/cloudprovider/providers/azure/azure_backoff.go index be93dbf4d41..1d903ceab79 100644 --- a/pkg/cloudprovider/providers/azure/azure_backoff.go +++ b/pkg/cloudprovider/providers/azure/azure_backoff.go @@ -302,11 +302,11 @@ func (az *Cloud) ListPIPWithRetry() ([]network.PublicIPAddress, error) { func (az *Cloud) CreateOrUpdatePIPWithRetry(pip network.PublicIPAddress) error { return wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { az.operationPollRateLimiter.Accept() - glog.V(10).Infof("PublicIPAddressesClient.CreateOrUpdate(%s, %s): start", resourceGroup, *pip.Name) - respChan, errChan := az.PublicIPAddressesClient.CreateOrUpdate(resourceGroup, *pip.Name, pip, nil) + glog.V(10).Infof("PublicIPAddressesClient.CreateOrUpdate(%s, %s): start", pipResourceGroup, *pip.Name) + respChan, errChan := az.PublicIPAddressesClient.CreateOrUpdate(pipResourceGroup, *pip.Name, pip, nil) resp := <-respChan err := <-errChan - glog.V(10).Infof("PublicIPAddressesClient.CreateOrUpdate(%s, %s): end", resourceGroup, *pip.Name) + glog.V(10).Infof("PublicIPAddressesClient.CreateOrUpdate(%s, %s): end", pipResourceGroup, *pip.Name) return processRetryResponse(resp.Response, err) }) } diff --git a/pkg/cloudprovider/providers/azure/azure_loadbalancer.go b/pkg/cloudprovider/providers/azure/azure_loadbalancer.go index d48fbbdeefb..6b08beb063d 100644 --- a/pkg/cloudprovider/providers/azure/azure_loadbalancer.go +++ b/pkg/cloudprovider/providers/azure/azure_loadbalancer.go @@ -394,6 +394,7 @@ func (az *Cloud) ensurePublicIPExists(serviceName, pipName, domainNameLabel stri return &pip, nil } + serviceName := getServiceName(service) pip.Name = to.StringPtr(pipName) pip.Location = to.StringPtr(az.Location) pip.PublicIPAddressPropertiesFormat = &network.PublicIPAddressPropertiesFormat{