Skip to content

Commit 1fd3719

Browse files
Merge pull request openshift#7793 from patrickdillon/OCPBUGS-24191
OCPBUGS-24191: set vmType in azure cloud config
2 parents 039d35b + f06c5eb commit 1fd3719

File tree

3 files changed

+202
-57
lines changed

3 files changed

+202
-57
lines changed

pkg/asset/manifests/azure/cloudproviderconfig.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ func (params CloudProviderConfig) JSON() (string, error) {
5353
// client side rate limiting is problematic for scaling operations. We disable it by default.
5454
// https://github.com/kubernetes-sigs/cloud-provider-azure/issues/247
5555
// https://bugzilla.redhat.com/show_bug.cgi?id=1782516#c7
56-
CloudProviderRateLimit: false,
5756
CloudProviderBackoff: true,
5857
CloudProviderBackoffDuration: 6,
58+
VMType: "standard",
5959

6060
UseInstanceMetadata: true,
6161
// default to standard load balancer, supports tcp resets on idle

pkg/asset/manifests/azure/cloudproviderconfig_test.go

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,14 @@ func TestCloudProviderConfig(t *testing.T) {
3939
"subnetName": "clusterid-worker-subnet",
4040
"securityGroupName": "clusterid-node-nsg",
4141
"routeTableName": "clusterid-node-routetable",
42-
"primaryAvailabilitySetName": "",
43-
"vmType": "",
44-
"primaryScaleSetName": "",
42+
"vmType": "standard",
43+
"loadBalancerSku": "standard",
4544
"cloudProviderBackoff": true,
46-
"cloudProviderBackoffRetries": 0,
47-
"cloudProviderBackoffExponent": 0,
48-
"cloudProviderBackoffDuration": 6,
49-
"cloudProviderBackoffJitter": 0,
50-
"cloudProviderRateLimit": false,
51-
"cloudProviderRateLimitQPS": 0,
52-
"cloudProviderRateLimitBucket": 0,
53-
"cloudProviderRateLimitQPSWrite": 0,
54-
"cloudProviderRateLimitBucketWrite": 0,
5545
"useInstanceMetadata": true,
56-
"loadBalancerSku": "standard",
5746
"excludeMasterFromStandardLB": false,
58-
"disableOutboundSNAT": null,
59-
"maximumLoadBalancerRuleCount": 0
47+
"cloudProviderBackoffDuration": 6,
48+
"putVMSSVMBatchSize": 0,
49+
"enableMigrateToIPBasedBackendPoolAPI": false
6050
}
6151
`
6252

0 commit comments

Comments
 (0)