Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OCPBUGS-41538: Remove bindings for XPN installs #8989

Merged
merged 1 commit into from
Sep 17, 2024
+29 −19
Merged

OCPBUGS-41538: Remove bindings for XPN installs #8989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions pkg/destroy/gcp/policybinding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"fmt"
"strings"

"github.com/pkg/errors"
"github.com/sirupsen/logrus"
resourcemanager "google.golang.org/api/cloudresourcemanager/v3"
"k8s.io/apimachinery/pkg/util/sets"
Expand All @@ -16,26 +15,26 @@ const (
projectNameFmt = "projects/%s"
)

func (o *ClusterUninstaller) getProjectIAMPolicy(ctx context.Context) (*resourcemanager.Policy, error) {
func (o *ClusterUninstaller) getProjectIAMPolicy(ctx context.Context, projectID string) (*resourcemanager.Policy, error) {
o.Logger.Debug("Fetching project IAM policy")
ctx, cancel := context.WithTimeout(ctx, defaultTimeout)
defer cancel()
req := &resourcemanager.GetIamPolicyRequest{}
policy, err := o.rmSvc.Projects.GetIamPolicy(fmt.Sprintf(projectNameFmt, o.ProjectID), req).Context(ctx).Do()
policy, err := o.rmSvc.Projects.GetIamPolicy(fmt.Sprintf(projectNameFmt, projectID), req).Context(ctx).Do()
if err != nil {
return nil, errors.Wrapf(err, "failed to fetch project IAM policy")
return nil, fmt.Errorf("failed to fetch project IAM policy in project %s: %w", projectID, err)
}
return policy, nil
}

func (o *ClusterUninstaller) setProjectIAMPolicy(ctx context.Context, policy *resourcemanager.Policy) error {
func (o *ClusterUninstaller) setProjectIAMPolicy(ctx context.Context, projectID string, policy *resourcemanager.Policy) error {
o.Logger.Debug("Setting project IAM policy")
ctx, cancel := context.WithTimeout(ctx, defaultTimeout)
defer cancel()
req := &resourcemanager.SetIamPolicyRequest{Policy: policy}
_, err := o.rmSvc.Projects.SetIamPolicy(fmt.Sprintf(projectNameFmt, o.ProjectID), req).Context(ctx).Do()
_, err := o.rmSvc.Projects.SetIamPolicy(fmt.Sprintf(projectNameFmt, projectID), req).Context(ctx).Do()
if err != nil {
return errors.Wrapf(err, "failed to set project IAM policy")
return fmt.Errorf("failed to set project IAM policy in project %s: %w", projectID, err)
}
return nil
}
Expand Down
35 changes: 23 additions & 12 deletions pkg/destroy/gcp/serviceaccount.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ func (o *ClusterUninstaller) listServiceAccounts(ctx context.Context) ([]cloudRe
key: item.Name,
name: item.Name,
url: item.Email,
project: item.ProjectId,
typeName: "serviceaccount",
quota: []gcp.QuotaUsage{{
Metric: &gcp.Metric{
Expand All @@ -44,7 +45,7 @@ func (o *ClusterUninstaller) listClusterServiceAccount(ctx context.Context) ([]*
ctx, cancel := context.WithTimeout(ctx, defaultTimeout)
defer cancel()
result := []*iam.ServiceAccount{}
req := o.iamSvc.Projects.ServiceAccounts.List(fmt.Sprintf("projects/%s", o.ProjectID)).Fields("accounts(name,displayName,email),nextPageToken")
req := o.iamSvc.Projects.ServiceAccounts.List(fmt.Sprintf("projects/%s", o.ProjectID)).Fields("accounts(name,displayName,email,projectId),nextPageToken")
err := req.Pages(ctx, func(list *iam.ListServiceAccountsResponse) error {
for idx, item := range list.Accounts {
if o.isClusterResource(item.Email) || o.isClusterResource(item.DisplayName) {
Expand All @@ -54,7 +55,7 @@ func (o *ClusterUninstaller) listClusterServiceAccount(ctx context.Context) ([]*
return nil
})
if err != nil {
return nil, errors.Wrapf(err, "failed to fetch service accounts")
return nil, fmt.Errorf("failed to fetch service accounts: %w", err)
}
return result, nil
}
Expand Down Expand Up @@ -84,22 +85,32 @@ func (o *ClusterUninstaller) destroyServiceAccounts(ctx context.Context) error {
return nil
}

// Remove service accounts from project policy
policy, err := o.getProjectIAMPolicy(ctx)
if err != nil {
return err
}
emails := sets.NewString()
for _, item := range items {
emails.Insert(item.url)
}
if o.clearIAMPolicyBindings(policy, emails, o.Logger) {
err = o.setProjectIAMPolicy(ctx, policy)

projects := []string{o.ProjectID}
if o.NetworkProjectID != "" {
projects = append(projects, o.NetworkProjectID)
}

// During XPN installs, permissions bindings occur in the host project. Those
// should be deleted here.
for _, project := range projects {
// Remove service accounts from project policy
policy, err := o.getProjectIAMPolicy(ctx, project)
if err != nil {
o.errorTracker.suppressWarning("iampolicy", err, o.Logger)
return errors.Errorf("%d items pending", len(items))
return err
}
if o.clearIAMPolicyBindings(policy, emails, o.Logger) {
err = o.setProjectIAMPolicy(ctx, project, policy)
if err != nil {
o.errorTracker.suppressWarning("iampolicy", err, o.Logger)
return errors.Errorf("%d items pending", len(items))
}
o.Logger.Infof("Deleted IAM project role bindings")
}
o.Logger.Infof("Deleted IAM project role bindings")
}

for _, item := range items {
Expand Down