Skip to content

Commit f0a4672

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#76656 from feiskyer/az-vmss-fix
Switch to instance-level update APIs for Azure VMSS loadbalancer operations
2 parents f9a3a22 + d35c3a2 commit f0a4672

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+973
-864
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ go 1.12
99
require (
1010
bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690
1111
cloud.google.com/go v0.0.0-20160913182117-3b1ae45394a2
12-
github.com/Azure/azure-sdk-for-go v21.3.0+incompatible
12+
github.com/Azure/azure-sdk-for-go v21.4.0+incompatible
1313
github.com/Azure/go-autorest v11.1.0+incompatible
1414
github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20181220005116-f8e995905100
1515
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab
@@ -203,7 +203,7 @@ require (
203203
replace (
204204
bitbucket.org/bertimus9/systemstat => bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690
205205
cloud.google.com/go => cloud.google.com/go v0.0.0-20160913182117-3b1ae45394a2
206-
github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v21.3.0+incompatible
206+
github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v21.4.0+incompatible
207207
github.com/Azure/go-ansiterm => github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78
208208
github.com/Azure/go-autorest => github.com/Azure/go-autorest v11.1.0+incompatible
209209
github.com/BurntSushi/toml => github.com/BurntSushi/toml v0.3.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690 h1:N9r8OBS
22
bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod h1:Ulb78X89vxKYgdL24HMTiXYHlyHEvruOj1ZPlqeNEZM=
33
cloud.google.com/go v0.0.0-20160913182117-3b1ae45394a2 h1:BD5IDvMK5RQqnDi7Fbizwoad9Uus/Hs/xJ1zMYVXlS8=
44
cloud.google.com/go v0.0.0-20160913182117-3b1ae45394a2/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
5-
github.com/Azure/azure-sdk-for-go v21.3.0+incompatible h1:YFvAka2WKAl2xnJkYV1e1b7E2z88AgFszDzWU18ejMY=
6-
github.com/Azure/azure-sdk-for-go v21.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
5+
github.com/Azure/azure-sdk-for-go v21.4.0+incompatible h1:rsdM2HqR64WhJv7YqMAjWOLAebbx4c9/gzcLC7yoDDE=
6+
github.com/Azure/azure-sdk-for-go v21.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
77
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
88
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
99
github.com/Azure/go-autorest v11.1.0+incompatible h1:9DfMsQdUMEtg1jKRTjtkNZsvOuZXJOMl4dN1kiQwAc8=

‎pkg/cloudprovider/providers/azure/BUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ go_library(
5858
"//staging/src/k8s.io/cloud-provider/volume:go_default_library",
5959
"//staging/src/k8s.io/cloud-provider/volume/errors:go_default_library",
6060
"//staging/src/k8s.io/cloud-provider/volume/helpers:go_default_library",
61-
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute:go_default_library",
61+
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute:go_default_library",
6262
"//vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network:go_default_library",
6363
"//vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage:go_default_library",
6464
"//vendor/github.com/Azure/azure-sdk-for-go/storage:go_default_library",
@@ -102,7 +102,7 @@ go_test(
102102
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
103103
"//staging/src/k8s.io/cloud-provider:go_default_library",
104104
"//staging/src/k8s.io/cloud-provider/service/helpers:go_default_library",
105-
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute:go_default_library",
105+
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute:go_default_library",
106106
"//vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network:go_default_library",
107107
"//vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage:go_default_library",
108108
"//vendor/github.com/Azure/go-autorest/autorest:go_default_library",

‎pkg/cloudprovider/providers/azure/azure.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
cloudprovider "k8s.io/cloud-provider"
3939
"k8s.io/kubernetes/pkg/cloudprovider/providers/azure/auth"
4040

41-
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute"
41+
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
4242
"github.com/Azure/go-autorest/autorest"
4343
"github.com/Azure/go-autorest/autorest/azure"
4444
"k8s.io/klog"

‎pkg/cloudprovider/providers/azure/azure_backoff.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121
"net/http"
2222

23-
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute"
23+
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
2424
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network"
2525

2626
"k8s.io/api/core/v1"

‎pkg/cloudprovider/providers/azure/azure_client.go‎

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"net/http"
2323
"time"
2424

25-
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute"
25+
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
2626
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network"
2727
"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage"
2828
"github.com/Azure/go-autorest/autorest"
@@ -89,10 +89,8 @@ type SecurityGroupsClient interface {
8989

9090
// VirtualMachineScaleSetsClient defines needed functions for azure compute.VirtualMachineScaleSetsClient
9191
type VirtualMachineScaleSetsClient interface {
92-
CreateOrUpdate(ctx context.Context, resourceGroupName string, VMScaleSetName string, parameters compute.VirtualMachineScaleSet) (resp *http.Response, err error)
9392
Get(ctx context.Context, resourceGroupName string, VMScaleSetName string) (result compute.VirtualMachineScaleSet, err error)
9493
List(ctx context.Context, resourceGroupName string) (result []compute.VirtualMachineScaleSet, err error)
95-
UpdateInstances(ctx context.Context, resourceGroupName string, VMScaleSetName string, VMInstanceIDs compute.VirtualMachineScaleSetVMInstanceRequiredIDs) (resp *http.Response, err error)
9694
}
9795

9896
// VirtualMachineScaleSetVMsClient defines needed functions for azure compute.VirtualMachineScaleSetVMsClient
@@ -835,30 +833,6 @@ func newAzVirtualMachineScaleSetsClient(config *azClientConfig) *azVirtualMachin
835833
}
836834
}
837835

838-
func (az *azVirtualMachineScaleSetsClient) CreateOrUpdate(ctx context.Context, resourceGroupName string, VMScaleSetName string, parameters compute.VirtualMachineScaleSet) (resp *http.Response, err error) {
839-
/* Write rate limiting */
840-
if !az.rateLimiterWriter.TryAccept() {
841-
err = createRateLimitErr(true, "VMSSCreateOrUpdate")
842-
return
843-
}
844-
845-
klog.V(10).Infof("azVirtualMachineScaleSetsClient.CreateOrUpdate(%q,%q): start", resourceGroupName, VMScaleSetName)
846-
defer func() {
847-
klog.V(10).Infof("azVirtualMachineScaleSetsClient.CreateOrUpdate(%q,%q): end", resourceGroupName, VMScaleSetName)
848-
}()
849-
850-
mc := newMetricContext("vmss", "create_or_update", resourceGroupName, az.client.SubscriptionID)
851-
future, err := az.client.CreateOrUpdate(ctx, resourceGroupName, VMScaleSetName, parameters)
852-
mc.Observe(err)
853-
if err != nil {
854-
return future.Response(), err
855-
}
856-
857-
err = future.WaitForCompletionRef(ctx, az.client.Client)
858-
mc.Observe(err)
859-
return future.Response(), err
860-
}
861-
862836
func (az *azVirtualMachineScaleSetsClient) Get(ctx context.Context, resourceGroupName string, VMScaleSetName string) (result compute.VirtualMachineScaleSet, err error) {
863837
if !az.rateLimiterReader.TryAccept() {
864838
err = createRateLimitErr(false, "VMSSGet")
@@ -906,30 +880,6 @@ func (az *azVirtualMachineScaleSetsClient) List(ctx context.Context, resourceGro
906880
return result, nil
907881
}
908882

909-
func (az *azVirtualMachineScaleSetsClient) UpdateInstances(ctx context.Context, resourceGroupName string, VMScaleSetName string, VMInstanceIDs compute.VirtualMachineScaleSetVMInstanceRequiredIDs) (resp *http.Response, err error) {
910-
/* Write rate limiting */
911-
if !az.rateLimiterWriter.TryAccept() {
912-
err = createRateLimitErr(true, "VMSSUpdateInstances")
913-
return
914-
}
915-
916-
klog.V(10).Infof("azVirtualMachineScaleSetsClient.UpdateInstances(%q,%q,%v): start", resourceGroupName, VMScaleSetName, VMInstanceIDs)
917-
defer func() {
918-
klog.V(10).Infof("azVirtualMachineScaleSetsClient.UpdateInstances(%q,%q,%v): end", resourceGroupName, VMScaleSetName, VMInstanceIDs)
919-
}()
920-
921-
mc := newMetricContext("vmss", "update_instances", resourceGroupName, az.client.SubscriptionID)
922-
future, err := az.client.UpdateInstances(ctx, resourceGroupName, VMScaleSetName, VMInstanceIDs)
923-
mc.Observe(err)
924-
if err != nil {
925-
return future.Response(), err
926-
}
927-
928-
err = future.WaitForCompletionRef(ctx, az.client.Client)
929-
mc.Observe(err)
930-
return future.Response(), err
931-
}
932-
933883
// azVirtualMachineScaleSetVMsClient implements VirtualMachineScaleSetVMsClient.
934884
type azVirtualMachineScaleSetVMsClient struct {
935885
client compute.VirtualMachineScaleSetVMsClient

‎pkg/cloudprovider/providers/azure/azure_controller_common.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"fmt"
2222
"time"
2323

24-
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute"
24+
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
2525
"k8s.io/klog"
2626

2727
"k8s.io/apimachinery/pkg/types"

‎pkg/cloudprovider/providers/azure/azure_controller_common_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"fmt"
2121
"testing"
2222

23-
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute"
23+
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
2424
)
2525

2626
func TestAttachDisk(t *testing.T) {

‎pkg/cloudprovider/providers/azure/azure_controller_standard.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"net/http"
2222
"strings"
2323

24-
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute"
24+
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
2525
"k8s.io/klog"
2626

2727
"k8s.io/apimachinery/pkg/types"

‎pkg/cloudprovider/providers/azure/azure_controller_vmss.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"net/http"
2222
"strings"
2323

24-
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-10-01/compute"
24+
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
2525
"k8s.io/klog"
2626

2727
"k8s.io/apimachinery/pkg/types"

0 commit comments

Comments
 (0)