Skip to content

Commit

Permalink
chore: add diskclient.ListByResourceGroup interface
Browse files Browse the repository at this point in the history 
update bazel config
  • Loading branch information
@andyzhangx
andyzhangx committed Aug 7, 2020
1 parent 92e51c1 commit c0071c6
Show file tree
Hide file tree
Showing 18 changed files with 195 additions and 220 deletions.
6 changes: 3 additions & 3 deletions staging/src/k8s.io/legacy-cloud-providers/azure/azure.go
View file
Expand Up @@ -248,7 +248,7 @@ type Cloud struct {

ResourceRequestBackoff wait.Backoff
metadata *InstanceMetadataService
vmSet VMSet
VMSet VMSet

// ipv6DualStack allows overriding for unit testing. It's normally initialized from featuregates
ipv6DualStackEnabled bool
Expand Down Expand Up @@ -491,12 +491,12 @@ func (az *Cloud) InitializeCloudFromConfig(config *Config, fromSecret bool) erro
}

if strings.EqualFold(vmTypeVMSS, az.Config.VMType) {
az.vmSet, err = newScaleSet(az)
az.VMSet, err = newScaleSet(az)
if err != nil {
return err
}
} else {
az.vmSet = newAvailabilitySet(az)
az.VMSet = newAvailabilitySet(az)
}

az.vmCache, err = az.newVMCache()
Expand Down
4 changes: 2 additions & 2 deletions staging/src/k8s.io/legacy-cloud-providers/azure/azure_backoff.go
View file
Expand Up @@ -111,7 +111,7 @@ func (az *Cloud) getPrivateIPsForMachineWithRetry(nodeName types.NodeName) ([]st
var privateIPs []string
err := wait.ExponentialBackoff(az.RequestBackoff(), func() (bool, error) {
var retryErr error
privateIPs, retryErr = az.vmSet.GetPrivateIPsByNodeName(string(nodeName))
privateIPs, retryErr = az.VMSet.GetPrivateIPsByNodeName(string(nodeName))
if retryErr != nil {
// won't retry since the instance doesn't exist on Azure.
if retryErr == cloudprovider.InstanceNotFound {
Expand All @@ -135,7 +135,7 @@ func (az *Cloud) GetIPForMachineWithRetry(name types.NodeName) (string, string,
var ip, publicIP string
err := wait.ExponentialBackoff(az.RequestBackoff(), func() (bool, error) {
var retryErr error
ip, publicIP, retryErr = az.vmSet.GetIPByNodeName(string(name))
ip, publicIP, retryErr = az.VMSet.GetIPByNodeName(string(name))
if retryErr != nil {
klog.Errorf("GetIPForMachineWithRetry(%s): backoff failure, will retry,err=%v", name, retryErr)
return false, nil
Expand Down
8 changes: 4 additions & 4 deletions staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common.go
View file
Expand Up @@ -90,15 +90,15 @@ type controllerCommon struct {

// getNodeVMSet gets the VMSet interface based on config.VMType and the real virtual machine type.
func (c *controllerCommon) getNodeVMSet(nodeName types.NodeName, crt azcache.AzureCacheReadType) (VMSet, error) {
// 1. vmType is standard, return cloud.vmSet directly.
// 1. vmType is standard, return cloud.VMSet directly.
if c.cloud.VMType == vmTypeStandard {
return c.cloud.vmSet, nil
return c.cloud.VMSet, nil
}

// 2. vmType is Virtual Machine Scale Set (vmss), convert vmSet to scaleSet.
ss, ok := c.cloud.vmSet.(*scaleSet)
ss, ok := c.cloud.VMSet.(*scaleSet)
if !ok {
return nil, fmt.Errorf("error of converting vmSet (%q) to scaleSet with vmType %q", c.cloud.vmSet, c.cloud.VMType)
return nil, fmt.Errorf("error of converting vmSet (%q) to scaleSet with vmType %q", c.cloud.VMSet, c.cloud.VMType)
}

// 3. If the node is managed by availability set, then return ss.availabilitySet.
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common_test.go
View file
Expand Up @@ -222,7 +222,7 @@ func TestCommonAttachDiskWithVMSS(t *testing.T) {
}
ss, err := newScaleSet(testCloud)
assert.Nil(t, err)
testCloud.vmSet = ss
testCloud.VMSet = ss
}

common := &controllerCommon{
Expand Down
6 changes: 3 additions & 3 deletions staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_standard_test.go
View file
Expand Up @@ -79,7 +79,7 @@ func TestStandardAttachDisk(t *testing.T) {

for i, test := range testCases {
testCloud := GetTestCloud(ctrl)
vmSet := testCloud.vmSet
vmSet := testCloud.VMSet
expectedVMs := setTestVirtualMachines(testCloud, map[string]string{"vm1": "PowerState/Running"}, false)
mockVMsClient := testCloud.VirtualMachinesClient.(*mockvmclient.MockInterface)
for _, vm := range expectedVMs {
Expand Down Expand Up @@ -148,7 +148,7 @@ func TestStandardDetachDisk(t *testing.T) {

for i, test := range testCases {
testCloud := GetTestCloud(ctrl)
vmSet := testCloud.vmSet
vmSet := testCloud.VMSet
expectedVMs := setTestVirtualMachines(testCloud, map[string]string{"vm1": "PowerState/Running"}, false)
mockVMsClient := testCloud.VirtualMachinesClient.(*mockvmclient.MockInterface)
for _, vm := range expectedVMs {
Expand Down Expand Up @@ -224,7 +224,7 @@ func TestGetDataDisks(t *testing.T) {
}
for i, test := range testCases {
testCloud := GetTestCloud(ctrl)
vmSet := testCloud.vmSet
vmSet := testCloud.VMSet
expectedVMs := setTestVirtualMachines(testCloud, map[string]string{"vm1": "PowerState/Running"}, false)
mockVMsClient := testCloud.VirtualMachinesClient.(*mockvmclient.MockInterface)
for _, vm := range expectedVMs {
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/legacy-cloud-providers/azure/azure_fakes.go
View file
Expand Up @@ -83,7 +83,7 @@ func GetTestCloud(ctrl *gomock.Controller) (az *Cloud) {
az.VirtualMachineScaleSetsClient = mockvmssclient.NewMockInterface(ctrl)
az.VirtualMachineScaleSetVMsClient = mockvmssvmclient.NewMockInterface(ctrl)
az.VirtualMachinesClient = mockvmclient.NewMockInterface(ctrl)
az.vmSet = newAvailabilitySet(az)
az.VMSet = newAvailabilitySet(az)
az.vmCache, _ = az.newVMCache()
az.lbCache, _ = az.newLBCache()
az.nsgCache, _ = az.newNSGCache()
Expand Down
24 changes: 12 additions & 12 deletions staging/src/k8s.io/legacy-cloud-providers/azure/azure_instances.go
View file
Expand Up @@ -95,7 +95,7 @@ func (az *Cloud) NodeAddresses(ctx context.Context, name types.NodeName) ([]v1.N

// Not local instance, get addresses from Azure ARM API.
if !isLocalInstance {
if az.vmSet != nil {
if az.VMSet != nil {
return az.addressGetter(name)
}

Expand Down Expand Up @@ -168,7 +168,7 @@ func (az *Cloud) NodeAddressesByProviderID(ctx context.Context, providerID strin
return nil, nil
}

name, err := az.vmSet.GetNodeNameByProviderID(providerID)
name, err := az.VMSet.GetNodeNameByProviderID(providerID)
if err != nil {
return nil, err
}
Expand All @@ -189,7 +189,7 @@ func (az *Cloud) InstanceExistsByProviderID(ctx context.Context, providerID stri
return true, nil
}

name, err := az.vmSet.GetNodeNameByProviderID(providerID)
name, err := az.VMSet.GetNodeNameByProviderID(providerID)
if err != nil {
if err == cloudprovider.InstanceNotFound {
return false, nil
Expand All @@ -214,7 +214,7 @@ func (az *Cloud) InstanceShutdownByProviderID(ctx context.Context, providerID st
return false, nil
}

nodeName, err := az.vmSet.GetNodeNameByProviderID(providerID)
nodeName, err := az.VMSet.GetNodeNameByProviderID(providerID)
if err != nil {
// Returns false, so the controller manager will continue to check InstanceExistsByProviderID().
if err == cloudprovider.InstanceNotFound {
Expand All @@ -224,7 +224,7 @@ func (az *Cloud) InstanceShutdownByProviderID(ctx context.Context, providerID st
return false, err
}

powerStatus, err := az.vmSet.GetPowerStatusByNodeName(string(nodeName))
powerStatus, err := az.VMSet.GetPowerStatusByNodeName(string(nodeName))
if err != nil {
// Returns false, so the controller manager will continue to check InstanceExistsByProviderID().
if err == cloudprovider.InstanceNotFound {
Expand Down Expand Up @@ -292,8 +292,8 @@ func (az *Cloud) InstanceID(ctx context.Context, name types.NodeName) (string, e

// Not local instance, get instanceID from Azure ARM API.
if !isLocalInstance {
if az.vmSet != nil {
return az.vmSet.GetInstanceIDByNodeName(nodeName)
if az.VMSet != nil {
return az.VMSet.GetInstanceIDByNodeName(nodeName)
}

// vmSet == nil indicates credentials are not provided.
Expand All @@ -302,7 +302,7 @@ func (az *Cloud) InstanceID(ctx context.Context, name types.NodeName) (string, e
return az.getLocalInstanceProviderID(metadata, nodeName)
}

return az.vmSet.GetInstanceIDByNodeName(nodeName)
return az.VMSet.GetInstanceIDByNodeName(nodeName)
}

func (az *Cloud) getLocalInstanceProviderID(metadata *InstanceMetadata, nodeName string) (string, error) {
Expand Down Expand Up @@ -342,7 +342,7 @@ func (az *Cloud) InstanceTypeByProviderID(ctx context.Context, providerID string
return "", nil
}

name, err := az.vmSet.GetNodeNameByProviderID(providerID)
name, err := az.VMSet.GetNodeNameByProviderID(providerID)
if err != nil {
return "", err
}
Expand Down Expand Up @@ -380,8 +380,8 @@ func (az *Cloud) InstanceType(ctx context.Context, name types.NodeName) (string,
return "", err
}
if !isLocalInstance {
if az.vmSet != nil {
return az.vmSet.GetInstanceTypeByNodeName(string(name))
if az.VMSet != nil {
return az.VMSet.GetInstanceTypeByNodeName(string(name))
}

// vmSet == nil indicates credentials are not provided.
Expand All @@ -393,7 +393,7 @@ func (az *Cloud) InstanceType(ctx context.Context, name types.NodeName) (string,
}
}

return az.vmSet.GetInstanceTypeByNodeName(string(name))
return az.VMSet.GetInstanceTypeByNodeName(string(name))
}

// AddSSHKeyToAllInstances adds an SSH public key as a legal identity for all instances
Expand Down

0 comments on commit c0071c6

Please sign in to comment.