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

Fix role assignment deletion creation

This commit is contained in:
Ciprian Hacman 2025-07-09 08:19:43 +03:00
parent 38af61248c
commit 5018458047
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/resources/azure/azure.go
View File

@ -63,6 +63,14 @@ func (g *resourceGetter) resourceGroupName() string {
return g.clusterInfo.AzureResourceGroupName
}
func (g *resourceGetter) resourceGroupID() string {
return fmt.Sprintf("/subscriptions/%s/resourceGroups/%s", g.clusterInfo.AzureSubscriptionID, g.clusterInfo.AzureResourceGroupName)
}
func (g *resourceGetter) storageAccountID() string {
return g.clusterInfo.AzureStorageAccountID
}
func (g *resourceGetter) listResourcesAzure() (map[string]*resources.Resource, error) {
rs, err := g.listAll()
if err != nil {
@ -397,11 +405,17 @@ func (g *resourceGetter) listVMScaleSetsAndRoleAssignments(ctx context.Context)
principalIDs[*vmss.Identity.PrincipalID] = vmss
}
ras, err := g.listRoleAssignments(ctx, principalIDs)
resourceGroupRAs, err := g.listRoleAssignments(ctx, principalIDs, g.resourceGroupID())
if err != nil {
return nil, err
}
rs = append(rs, ras...)
rs = append(rs, resourceGroupRAs...)
storageAccountRAs, err := g.listRoleAssignments(ctx, principalIDs, g.storageAccountID())
if err != nil {
return nil, err
}
rs = append(rs, storageAccountRAs...)
return rs, nil
}
@ -509,8 +523,8 @@ func (g *resourceGetter) deleteDisk(_ fi.Cloud, r *resources.Resource) error {
return g.cloud.Disk().Delete(context.TODO(), g.resourceGroupName(), r.Name)
}
func (g *resourceGetter) listRoleAssignments(ctx context.Context, principalIDs map[string]*compute.VirtualMachineScaleSet) ([]*resources.Resource, error) {
ras, err := g.cloud.RoleAssignment().List(ctx, g.resourceGroupName())
func (g *resourceGetter) listRoleAssignments(ctx context.Context, principalIDs map[string]*compute.VirtualMachineScaleSet, scope string) ([]*resources.Resource, error) {
ras, err := g.cloud.RoleAssignment().List(ctx, scope)
if err != nil {
return nil, err
}

2
pkg/resources/clusterinfo.go
View File

@ -20,6 +20,8 @@ type ClusterInfo struct {
Name string
UsesNoneDNS bool
// Azure specific
AzureStorageAccountID string
AzureSubscriptionID string
AzureResourceGroupName string
AzureResourceGroupShared bool
AzureNetworkShared bool

2
pkg/resources/ops/collector.go
View File

@ -57,6 +57,8 @@ func ListResources(cloud fi.Cloud, cluster *kops.Cluster) (map[string]*resources
case kops.CloudProviderOpenstack:
return openstack.ListResources(cloud.(cloudopenstack.OpenstackCloud), clusterInfo)
case kops.CloudProviderAzure:
clusterInfo.AzureStorageAccountID = cluster.Spec.CloudProvider.Azure.StorageAccountID
clusterInfo.AzureSubscriptionID = cluster.Spec.CloudProvider.Azure.SubscriptionID
clusterInfo.AzureResourceGroupName = cluster.AzureResourceGroupName()
clusterInfo.AzureResourceGroupShared = cluster.IsSharedAzureResourceGroup()
clusterInfo.AzureNetworkShared = cluster.SharedVPC()