Skip to content

Fix SecurityGroup availability status by counting security group rules #651

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

Open
gndrmnn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix SecurityGroup availability status by counting security group rules #651

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
6 changes: 6 additions & 0 deletions internal/controllers/securitygroup/actuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"errors"
"fmt"
"iter"
"time"

"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/security/groups"
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/security/rules"
Expand Down Expand Up @@ -50,6 +51,11 @@ type (
securityGroupIterator = iter.Seq2[*osResourceT, error]
)

const (
// The frequency to poll when waiting for the resource to become available
securityGroupAvailablePollingPeriod = 15 * time.Second
)

type securityGroupActuator struct {
osClient osclients.NetworkClient
k8sClient client.Client
Expand Down
19 changes: 18 additions & 1 deletion internal/controllers/securitygroup/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,24 @@ func (securityGroupStatusWriter) ResourceAvailableStatus(orcObject orcObjectPT,
}
}

// SecurityGroup is available as soon as it exists
resourceSpec := orcObject.Spec.Resource
if resourceSpec != nil && resourceSpec.Rules != nil {
// Make sure specified security group rules exist in resource

resourceStatus := orcObject.Status.Resource
if resourceStatus == nil || resourceStatus.Rules == nil {
return metav1.ConditionFalse, progress.WaitingOnOpenStack(progress.WaitingOnReady, securityGroupAvailablePollingPeriod)
}

if len(resourceSpec.Rules) != len(resourceStatus.Rules) {
return metav1.ConditionFalse, progress.WaitingOnOpenStack(progress.WaitingOnReady, securityGroupAvailablePollingPeriod)
}

if len(resourceSpec.Rules) != len(osResource.Rules) {
return metav1.ConditionFalse, progress.WaitingOnOpenStack(progress.WaitingOnReady, securityGroupAvailablePollingPeriod)
}
}

return metav1.ConditionTrue, nil
}

Expand Down