Skip to content

Commit 4cfcd0f

Browse files
willie-yaok8s-infra-cherrypick-robot
authored andcommitted
Use vnet resource group
1 parent 3a90a1e commit 4cfcd0f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

azure/scope/cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ func (s *ClusterScope) AzureBastion() *infrav1.AzureBastion {
558558
// AzureBastionSpec returns the bastion spec.
559559
func (s *ClusterScope) AzureBastionSpec() azure.ASOResourceSpecGetter[*asonetworkv1api20220701.BastionHost] {
560560
if s.IsAzureBastionEnabled() {
561-
subnetID := azure.SubnetID(s.SubscriptionID(), s.ResourceGroup(), s.Vnet().Name, s.AzureBastion().Subnet.Name)
561+
subnetID := azure.SubnetID(s.SubscriptionID(), s.Vnet().ResourceGroup, s.Vnet().Name, s.AzureBastion().Subnet.Name)
562562
publicIPID := azure.PublicIPID(s.SubscriptionID(), s.ResourceGroup(), s.AzureBastion().PublicIP.Name)
563563

564564
return &bastionhosts.AzureBastionSpec{

azure/scope/cluster_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1805,7 +1805,7 @@ func TestAzureBastionSpec(t *testing.T) {
18051805
Location: "centralIndia",
18061806
ClusterName: "my-cluster",
18071807
SubnetID: fmt.Sprintf("/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Network/"+
1808-
"virtualNetworks/%s/subnets/%s", "123", "my-rg", "fake-vnet-1", "fake-bastion-subnet-1"),
1808+
"virtualNetworks/%s/subnets/%s", "123", "my-rg-vnet", "fake-vnet-1", "fake-bastion-subnet-1"),
18091809
PublicIPID: fmt.Sprintf("/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Network/"+
18101810
"publicIPAddresses/%s", "123", "my-rg", "fake-public-ip-1"),
18111811
},

0 commit comments

Comments
 (0)