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

OCPBUGS-35262: Skip firewall rule creation if permission is missing #8706

Merged
merged 1 commit into from
Jul 10, 2024
Merged

OCPBUGS-35262: Skip firewall rule creation if permission is missing #8706

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
27 changes: 27 additions & 0 deletions pkg/infrastructure/gcp/clusterapi/firewallrules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,20 @@ import (
"fmt"
"time"

"github.com/sirupsen/logrus"
"google.golang.org/api/compute/v1"

gcpconfig "github.com/openshift/installer/pkg/asset/installconfig/gcp"
"github.com/openshift/installer/pkg/infrastructure/clusterapi"
"github.com/openshift/installer/pkg/types"
)

const (
// gcpFirewallPermission is the role/permission to create or skip the creation of
// firewall rules for GCP during a xpn installation.
gcpFirewallPermission = "compute.firewalls.create"
)

func getEtcdPorts() []*compute.FirewallAllowed {
return []*compute.FirewallAllowed{
{
Expand Down Expand Up @@ -209,6 +217,25 @@ func deleteFirewallRule(ctx context.Context, name, projectID string) error {

// createFirewallRules creates the rules needed between the worker and master nodes.
func createFirewallRules(ctx context.Context, in clusterapi.InfraReadyInput, network string) error {
if projID := in.InstallConfig.Config.GCP.NetworkProjectID; projID != "" {
client, err := gcpconfig.NewClient(context.Background())
if err != nil {
return fmt.Errorf("failed to create client during firewall rule creation: %w", err)
}

permissions, err := client.GetProjectPermissions(ctx, projID, []string{
gcpFirewallPermission,
})
if err != nil {
return fmt.Errorf("failed to find project permissions during firewall creation: %w", err)
}

if !permissions.Has(gcpFirewallPermission) {
logrus.Warnf("failed to find permission %s, skipping firewall rule creation", gcpFirewallPermission)
return nil
}
}

projectID := in.InstallConfig.Config.Platform.GCP.ProjectID
if in.InstallConfig.Config.Platform.GCP.NetworkProjectID != "" {
projectID = in.InstallConfig.Config.Platform.GCP.NetworkProjectID
Expand Down