github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-22 10:06:15 +00:00
Code Issues Projects Releases Wiki Activity

annotate service with resource group

Browse Source
This commit is contained in:
chshou 2017-10-09 23:58:47 -07:00
parent 540baa9796
commit 9054137d05
3 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cloudprovider/providers/azure/azure_backoff.go
View File

@ -302,11 +302,11 @@ func (az *Cloud) ListPIPWithRetry() ([]network.PublicIPAddress, error) {
func (az *Cloud) CreateOrUpdatePIPWithRetry(pip network.PublicIPAddress) error { func (az *Cloud) CreateOrUpdatePIPWithRetry(pip network.PublicIPAddress) error {
return wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) { return wait.ExponentialBackoff(az.requestBackoff(), func() (bool, error) {
az.operationPollRateLimiter.Accept() az.operationPollRateLimiter.Accept()
glog.V(10).Infof("PublicIPAddressesClient.CreateOrUpdate(%s): start", *pip.Name) glog.V(10).Infof("PublicIPAddressesClient.CreateOrUpdate(%s, %s): start", resourceGroup, *pip.Name)
respChan, errChan := az.PublicIPAddressesClient.CreateOrUpdate(az.ResourceGroup, *pip.Name, pip, nil) respChan, errChan := az.PublicIPAddressesClient.CreateOrUpdate(resourceGroup, *pip.Name, pip, nil)
resp := <-respChan resp := <-respChan
err := <-errChan err := <-errChan
glog.V(10).Infof("PublicIPAddressesClient.CreateOrUpdate(%s): end", *pip.Name) glog.V(10).Infof("PublicIPAddressesClient.CreateOrUpdate(%s, %s): end", resourceGroup, *pip.Name)
return processRetryResponse(resp.Response, err) return processRetryResponse(resp.Response, err)
}) })
} }

6
pkg/cloudprovider/providers/azure/azure_loadbalancer.go
View File

@ -416,9 +416,9 @@ func (az *Cloud) ensurePublicIPExists(serviceName, pipName, domainNameLabel stri
glog.V(10).Infof("CreateOrUpdatePIPWithRetry(%q): end", *pip.Name) glog.V(10).Infof("CreateOrUpdatePIPWithRetry(%q): end", *pip.Name)
az.operationPollRateLimiter.Accept() az.operationPollRateLimiter.Accept()
glog.V(10).Infof("PublicIPAddressesClient.Get(%q): start", *pip.Name) glog.V(10).Infof("PublicIPAddressesClient.Get(%s, %q): start", pipResourceGroup, *pip.Name)
pip, err = az.PublicIPAddressesClient.Get(az.ResourceGroup, *pip.Name, "") pip, err = az.PublicIPAddressesClient.Get(pipResourceGroup, *pip.Name, "")
glog.V(10).Infof("PublicIPAddressesClient.Get(%q): end", *pip.Name) glog.V(10).Infof("PublicIPAddressesClient.Get(%s, %q): end", pipResourceGroup, *pip.Name)
if err != nil { if err != nil {
return nil, err return nil, err
} }

20
pkg/cloudprovider/providers/azure/azure_util.go
View File

@ -699,23 +699,3 @@ func (as *availabilitySet) EnsureBackendPoolDeleted(poolID, vmSetName string) er
// Do nothing for availability set. // Do nothing for availability set.
return nil return nil
} }
// parseResourceGroupNameFromID parses the resource group name from a resource ID
func parseResourceGroupNameFromID(resourceID string) (resourceGroupName string, err error) {
reg, err := regexp.Compile(`(?i)(.*?)/resourceGroups/(?P<rgname>\S+)/providers/(.*?)`)
if err != nil {
return "", err
}
matchNames := reg.SubexpNames()
matches := reg.FindStringSubmatch(resourceID)
for i := range matchNames {
if matchNames[i] == "rgname" {
return matches[i], nil
}
}
return "", fmt.Errorf("Invalid resource ID: %s", resourceID)
}