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

Merge pull request #16510 from hakman/azure_fix_delete_instance 

azure: Fix instance deletion
This commit is contained in:
Kubernetes Prow Robot 2024-05-04 03:44:43 -07:00 committed by GitHub
parent 1d9353523c afbafff75d
commit ba67b94d64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
upup/pkg/fi/cloudup/azure/azure_cloud.go
View File

@ -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.

4
upup/pkg/fi/cloudup/utils.go
View File

@ -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
}