kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15081 from hakman/azure_experiments 

azure: Use Basic SKU for the API LB
This commit is contained in:
Kubernetes Prow Robot 2023-01-31 01:54:56 -08:00 committed by GitHub
parent ebebbe8b76 163bf856d4
commit 8a3a64206d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
upup/pkg/fi/cloudup/azuretasks/loadbalancer.go
View File

@ -149,7 +149,7 @@ func (*LoadBalancer) RenderAzure(t *azure.AzureAPITarget, a, e, changes *LoadBal
lb := network.LoadBalancer{ lb := network.LoadBalancer{
Location: to.StringPtr(t.Cloud.Region()), Location: to.StringPtr(t.Cloud.Region()),
Sku: &network.LoadBalancerSku{ Sku: &network.LoadBalancerSku{
Name: network.LoadBalancerSkuNameBasic, Name: network.LoadBalancerSkuNameStandard,
}, },
LoadBalancerPropertiesFormat: &network.LoadBalancerPropertiesFormat{ LoadBalancerPropertiesFormat: &network.LoadBalancerPropertiesFormat{
FrontendIPConfigurations: &[]network.FrontendIPConfiguration{ FrontendIPConfigurations: &[]network.FrontendIPConfiguration{

5
upup/pkg/fi/cloudup/azuretasks/publicipaddress.go
View File

@ -116,7 +116,10 @@ func (*PublicIPAddress) RenderAzure(t *azure.AzureAPITarget, a, e, changes *Publ
Name: to.StringPtr(*e.Name), Name: to.StringPtr(*e.Name),
PublicIPAddressPropertiesFormat: &network.PublicIPAddressPropertiesFormat{ PublicIPAddressPropertiesFormat: &network.PublicIPAddressPropertiesFormat{
PublicIPAddressVersion: network.IPv4, PublicIPAddressVersion: network.IPv4,
PublicIPAllocationMethod: network.Dynamic, PublicIPAllocationMethod: network.Static,
},
Sku: &network.PublicIPAddressSku{
Name: network.PublicIPAddressSkuNameStandard,
}, },
Tags: e.Tags, Tags: e.Tags,
} }

1
upup/pkg/fi/cloudup/new_cluster.go
View File

@ -699,6 +699,7 @@ func setupZones(opt *NewClusterOptions, cluster *api.Cluster, allZones sets.Stri
} }
zoneToSubnetMap[zoneName] = subnet zoneToSubnetMap[zoneName] = subnet
} }
return zoneToSubnetMap, nil
case api.CloudProviderAWS: case api.CloudProviderAWS:
if len(opt.Zones) > 0 && len(opt.SubnetIDs) > 0 { if len(opt.Zones) > 0 && len(opt.SubnetIDs) > 0 {