github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #51677 from itowlson/azure-cloud-provider-vet

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix format specifiers in Azure cloud provider

**What this PR does / why we need it**: Fixes invalid/mismatched format specifiers in Azure cloud provider logging statements (`glog...Infof(...)`) that would cause information to be lost in logging output, as flagged by `go vet`.

**Which issue this PR fixes**: None

**Special notes for your reviewer**: None

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-10-11 08:41:07 -07:00 committed by GitHub
commit 40e6a6b7ad
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cloudprovider/providers/azure/azure.go
View File

@ -285,7 +285,7 @@ func NewCloud(configReader io.Reader) (cloudprovider.Interface, error) {
az.operationPollRateLimiter = flowcontrol.NewTokenBucketRateLimiter( az.operationPollRateLimiter = flowcontrol.NewTokenBucketRateLimiter(
az.CloudProviderRateLimitQPS, az.CloudProviderRateLimitQPS,
az.CloudProviderRateLimitBucket) az.CloudProviderRateLimitBucket)
glog.V(2).Infof("Azure cloudprovider using rate limit config: QPS=%d, bucket=%d", glog.V(2).Infof("Azure cloudprovider using rate limit config: QPS=%g, bucket=%d",
az.CloudProviderRateLimitQPS, az.CloudProviderRateLimitQPS,
az.CloudProviderRateLimitBucket) az.CloudProviderRateLimitBucket)
} else { } else {

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

@ -157,11 +157,11 @@ func (az *Cloud) DeleteLBWithRetry(lbName string) error {
func (az *Cloud) CreateOrUpdateRouteTableWithRetry(routeTable network.RouteTable) error { func (az *Cloud) CreateOrUpdateRouteTableWithRetry(routeTable network.RouteTable) error {
return wait.ExponentialBackoff(az.resourceRequestBackoff, func() (bool, error) { return wait.ExponentialBackoff(az.resourceRequestBackoff, func() (bool, error) {
az.operationPollRateLimiter.Accept() az.operationPollRateLimiter.Accept()
glog.V(10).Infof("RouteTablesClient.CreateOrUpdate(%s): start", routeTable) glog.V(10).Infof("RouteTablesClient.CreateOrUpdate(%s): start", *routeTable.Name)
respChan, errChan := az.RouteTablesClient.CreateOrUpdate(az.ResourceGroup, az.RouteTableName, routeTable, nil) respChan, errChan := az.RouteTablesClient.CreateOrUpdate(az.ResourceGroup, az.RouteTableName, routeTable, nil)
resp := <-respChan resp := <-respChan
err := <-errChan err := <-errChan
glog.V(10).Infof("RouteTablesClient.CreateOrUpdate(%s): end", routeTable) glog.V(10).Infof("RouteTablesClient.CreateOrUpdate(%s): end", *routeTable.Name)
return processRetryResponse(resp.Response, err) return processRetryResponse(resp.Response, err)
}) })
} }

4
pkg/cloudprovider/providers/azure/azure_blobDiskController.go
View File

@ -184,7 +184,7 @@ func (c *BlobDiskController) createVHDBlobDisk(blobClient azstorage.BlobStorageC
tags := make(map[string]string) tags := make(map[string]string)
tags["createdby"] = "k8sAzureDataDisk" tags["createdby"] = "k8sAzureDataDisk"
glog.V(4).Infof("azureDisk - creating page blob %name in container %s account %s", vhdName, containerName, accountName) glog.V(4).Infof("azureDisk - creating page blob %s in container %s account %s", vhdName, containerName, accountName)
blob := container.GetBlobReference(vhdName) blob := container.GetBlobReference(vhdName)
blob.Properties.ContentLength = vhdSize blob.Properties.ContentLength = vhdSize
@ -628,7 +628,7 @@ func (c *BlobDiskController) createStorageAccount(storageAccountName string, sto
// SA Accounts takes time to be provisioned // SA Accounts takes time to be provisioned
// so if this account was just created allow it sometime // so if this account was just created allow it sometime
// before polling // before polling
glog.V(2).Infof("azureDisk - storage account %s was just created, allowing time before polling status") glog.V(2).Infof("azureDisk - storage account %s was just created, allowing time before polling status", storageAccountName)
time.Sleep(25 * time.Second) // as observed 25 is the average time for SA to be provisioned time.Sleep(25 * time.Second) // as observed 25 is the average time for SA to be provisioned
} }