Merge pull request #17538 from hakman/azure-fix-rooling-update

k8s-ci-robot · web-flow · commit f1c5d36d1a51 · 2025-08-03T04:49:39.000-07:00
azure: Fix rolling-update error
diff --git a/upup/pkg/fi/cloudup/utils.go b/upup/pkg/fi/cloudup/utils.go
@@ -162,7 +162,7 @@ func BuildCloud(cluster *kops.Cluster) (fi.Cloud, error) {
 			}
 
 			subscriptionID := cluster.Spec.CloudProvider.Azure.SubscriptionID
-			resourceGroupName := cluster.Spec.CloudProvider.Azure.ResourceGroupName
+			resourceGroupName := cluster.AzureResourceGroupName()
 			azureCloud, err := azure.NewAzureCloud(subscriptionID, resourceGroupName, region, cloudTags)
 			if err != nil {
 				return nil, err

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ func BuildCloud(cluster *kops.Cluster) (fi.Cloud, error) {`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`subscriptionID := cluster.Spec.CloudProvider.Azure.SubscriptionID`
`165`		`- resourceGroupName := cluster.Spec.CloudProvider.Azure.ResourceGroupName`
	`165`	`+ resourceGroupName := cluster.AzureResourceGroupName()`
`166`	`166`	`azureCloud, err := azure.NewAzureCloud(subscriptionID, resourceGroupName, region, cloudTags)`
`167`	`167`	`if err != nil {`
`168`	`168`	`return nil, err`