Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1987083: Azure: cloud provider config excludeMastersFromStandardLB -> false #5111

Merged
merged 1 commit into from
Jul 29, 2021
Merged

Bug 1987083: Azure: cloud provider config excludeMastersFromStandardLB -> false #5111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion pkg/asset/manifests/azure/cloudproviderconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ type CloudProviderConfig struct {
// managed resource names are matching the convention defined by capz
func (params CloudProviderConfig) JSON() (string, error) {

// Config requires type *bool for excludeMasterFromStandardLB, so define a variable here to get an address in the config.
excludeMasterFromStandardLB := false

config := config{
authConfig: authConfig{
Cloud: params.CloudName.Name(),
Expand Down Expand Up @@ -59,7 +62,8 @@ func (params CloudProviderConfig) JSON() (string, error) {
UseInstanceMetadata: true,
// default to standard load balancer, supports tcp resets on idle
// https://docs.microsoft.com/en-us/azure/load-balancer/load-balancer-tcp-reset
LoadBalancerSku: "standard",
LoadBalancerSku: "standard",
ExcludeMasterFromStandardLB: &excludeMasterFromStandardLB,
}

if params.ARO {
Expand Down
2 changes: 1 addition & 1 deletion pkg/asset/manifests/azure/cloudproviderconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func TestCloudProviderConfig(t *testing.T) {
"cloudProviderRateLimitBucketWrite": 0,
"useInstanceMetadata": true,
"loadBalancerSku": "standard",
"excludeMasterFromStandardLB": null,
"excludeMasterFromStandardLB": false,
"disableOutboundSNAT": null,
"maximumLoadBalancerRuleCount": 0
}
Expand Down