Merge pull request #16510 from hakman/azure_fix_delete_instance

azure: Fix instance deletion
kubernetes · May 4, 2024 · ba67b94 · ba67b94
2 parents 1d93535 + afbafff
commit ba67b94
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/upup/pkg/fi/cloudup/azure/azure_cloud.go b/upup/pkg/fi/cloudup/azure/azure_cloud.go
@@ -64,6 +64,7 @@ type AzureCloud interface {
 
 type azureCloudImplementation struct {
 	subscriptionID                  string
+	resourceGroupName               string
 	location                        string
 	tags                            map[string]string
 	resourceGroupsClient            ResourceGroupsClient
@@ -85,16 +86,17 @@ type azureCloudImplementation struct {
 var _ fi.Cloud = &azureCloudImplementation{}
 
 // NewAzureCloud creates a new AzureCloud.
-func NewAzureCloud(subscriptionID, location string, tags map[string]string) (AzureCloud, error) {
+func NewAzureCloud(subscriptionID, resourceGroupName, location string, tags map[string]string) (AzureCloud, error) {
 	cred, err := azidentity.NewDefaultAzureCredential(nil)
 	if err != nil {
 		return nil, fmt.Errorf("error creating an identity: %s", err)
 	}
 
 	azureCloudImpl := &azureCloudImplementation{
-		subscriptionID: subscriptionID,
-		location:       location,
-		tags:           tags,
+		subscriptionID:    subscriptionID,
+		resourceGroupName: resourceGroupName,
+		location:          location,
+		tags:              tags,
 	}
 
 	if azureCloudImpl.resourceGroupsClient, err = newResourceGroupsClientImpl(subscriptionID, cred); err != nil {
@@ -195,7 +197,7 @@ func (c *azureCloudImplementation) FindVNetInfo(id, resourceGroup string) (*fi.V
 func (c *azureCloudImplementation) DeleteInstance(i *cloudinstances.CloudInstance) error {
 	vmssName := i.CloudInstanceGroup.HumanName
 	instanceID := strings.TrimPrefix(i.ID, vmssName+"_")
-	return c.vmscaleSetVMsClient.Delete(context.TODO(), "my.k8s", vmssName, instanceID)
+	return c.vmscaleSetVMsClient.Delete(context.TODO(), c.resourceGroupName, vmssName, instanceID)
 }
 
 // DeregisterInstance drains a cloud instance and loadbalancers.

diff --git a/upup/pkg/fi/cloudup/utils.go b/upup/pkg/fi/cloudup/utils.go
@@ -157,7 +157,9 @@ func BuildCloud(cluster *kops.Cluster) (fi.Cloud, error) {
 
 			cloudTags := map[string]string{azure.TagClusterName: cluster.ObjectMeta.Name}
 
-			azureCloud, err := azure.NewAzureCloud(cluster.Spec.CloudProvider.Azure.SubscriptionID, region, cloudTags)
+			subscriptionID := cluster.Spec.CloudProvider.Azure.SubscriptionID
+			resourceGroupName := cluster.Spec.CloudProvider.Azure.ResourceGroupName
+			azureCloud, err := azure.NewAzureCloud(subscriptionID, resourceGroupName, region, cloudTags)
 			if err != nil {
 				return nil, err
 			}