github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

fix: make changes due to azure sdk upgrade

Browse Source 
feat: fix disks client failure

fix: revert api-version change

revert disks client change
This commit is contained in:
andyzhangx 2020-03-13 09:15:35 +00:00
parent da20cc202f
commit dd9474e78e
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/legacy-cloud-providers/azure/azure_blobDiskController.go
View File

@ -344,7 +344,7 @@ func (c *BlobDiskController) ensureDefaultContainer(storageAccountName string) e
} }
// account exists but not ready yet // account exists but not ready yet
if provisionState != storage.ProvisioningStateSucceeded { if provisionState != storage.Succeeded {
// we don't want many attempts to validate the account readiness // we don't want many attempts to validate the account readiness
// here hence we are locking // here hence we are locking
counter := 1 counter := 1
@ -375,7 +375,7 @@ func (c *BlobDiskController) ensureDefaultContainer(storageAccountName string) e
return false, nil // error performing the query - retryable return false, nil // error performing the query - retryable
} }
if provisionState == storage.ProvisioningStateSucceeded { if provisionState == storage.Succeeded {
return true, nil return true, nil
} }

6
staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController.go
View File

@ -124,15 +124,15 @@ func (c *ManagedDiskController) CreateManagedDisk(options *ManagedDiskOptions) (
} }
diskProperties.DiskIOPSReadWrite = to.Int64Ptr(diskIOPSReadWrite) diskProperties.DiskIOPSReadWrite = to.Int64Ptr(diskIOPSReadWrite)
diskMBpsReadWrite := int32(defaultDiskMBpsReadWrite) diskMBpsReadWrite := int64(defaultDiskMBpsReadWrite)
if options.DiskMBpsReadWrite != "" { if options.DiskMBpsReadWrite != "" {
v, err := strconv.Atoi(options.DiskMBpsReadWrite) v, err := strconv.Atoi(options.DiskMBpsReadWrite)
if err != nil { if err != nil {
return "", fmt.Errorf("AzureDisk - failed to parse DiskMBpsReadWrite: %v", err) return "", fmt.Errorf("AzureDisk - failed to parse DiskMBpsReadWrite: %v", err)
} }
diskMBpsReadWrite = int32(v) diskMBpsReadWrite = int64(v)
} }
diskProperties.DiskMBpsReadWrite = to.Int32Ptr(diskMBpsReadWrite) diskProperties.DiskMBpsReadWrite = to.Int64Ptr(diskMBpsReadWrite)
} else { } else {
if options.DiskIOPSReadWrite != "" { if options.DiskIOPSReadWrite != "" {
return "", fmt.Errorf("AzureDisk - DiskIOPSReadWrite parameter is only applicable in UltraSSD_LRS disk type") return "", fmt.Errorf("AzureDisk - DiskIOPSReadWrite parameter is only applicable in UltraSSD_LRS disk type")

2
staging/src/k8s.io/legacy-cloud-providers/azure/clients/diskclient/interface.go
View File

@ -27,7 +27,7 @@ import (
const ( const (
// APIVersion is the API version for compute. // APIVersion is the API version for compute.
APIVersion = "2019-12-01" APIVersion = "2019-07-01"
) )
// Interface is the client interface for Disks. // Interface is the client interface for Disks.

2
staging/src/k8s.io/legacy-cloud-providers/azure/clients/snapshotclient/interface.go
View File

@ -27,7 +27,7 @@ import (
const ( const (
// APIVersion is the API version for compute. // APIVersion is the API version for compute.
APIVersion = "2019-12-01" APIVersion = "2019-07-01"
) )
// Interface is the client interface for Snapshots. // Interface is the client interface for Snapshots.

2
staging/src/k8s.io/legacy-cloud-providers/azure/clients/vmclient/interface.go
View File

@ -27,7 +27,7 @@ import (
const ( const (
// APIVersion is the API version for VirtualMachine. // APIVersion is the API version for VirtualMachine.
APIVersion = "2019-12-01" APIVersion = "2019-07-01"
) )
// Interface is the client interface for VirtualMachines. // Interface is the client interface for VirtualMachines.

2
staging/src/k8s.io/legacy-cloud-providers/azure/clients/vmsizeclient/interface.go
View File

@ -27,7 +27,7 @@ import (
const ( const (
// APIVersion is the API version for compute. // APIVersion is the API version for compute.
APIVersion = "2019-12-01" APIVersion = "2019-07-01"
) )
// Interface is the client interface for VirtualMachineSizes. // Interface is the client interface for VirtualMachineSizes.

2
staging/src/k8s.io/legacy-cloud-providers/azure/clients/vmssclient/interface.go
View File

@ -27,7 +27,7 @@ import (
const ( const (
// APIVersion is the API version for VMSS. // APIVersion is the API version for VMSS.
APIVersion = "2019-12-01" APIVersion = "2019-07-01"
) )
// Interface is the client interface for VirtualMachineScaleSet. // Interface is the client interface for VirtualMachineScaleSet.

2
staging/src/k8s.io/legacy-cloud-providers/azure/clients/vmssvmclient/interface.go
View File

@ -27,7 +27,7 @@ import (
const ( const (
// APIVersion is the API version for VMSS. // APIVersion is the API version for VMSS.
APIVersion = "2019-12-01" APIVersion = "2019-07-01"
) )
// Interface is the client interface for VirtualMachineScaleSetVM. // Interface is the client interface for VirtualMachineScaleSetVM.