Skip to content

Simplify dependency ready filters to use IsAvailable directly #674

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
mandre wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Simplify dependency ready filters to use IsAvailable directly #674

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
2 changes: 1 addition & 1 deletion api/v1alpha1/conditions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func GetTerminalError(obj ObjectWithConditions) error {
return nil
}

func IsAvailable(obj ObjectWithConditions) bool {
func IsAvailable[T ObjectWithConditions](obj T) bool {
conditions := obj.GetConditions()
available := meta.FindStatusCondition(conditions, ConditionAvailable)

Expand Down
24 changes: 10 additions & 14 deletions cmd/scaffold-controller/data/controller/actuator.go.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ func (actuator {{ .PackageName }}Actuator) ListOSResourcesForImport(ctx context.
var reconcileStatus progress.ReconcileStatus
{{- range .ImportDependencies }}
{{ $depNameCamelCase := . | camelCase }}
{{ $depNameCamelCase }}, rs := dependency.FetchDependency(
{{ $depNameCamelCase }}, rs := dependency.FetchDependency[*orcv1alpha1.{{ . }}](
ctx, actuator.k8sClient, obj.Namespace,
filter.{{ . }}Ref, "{{ . }}",
func(dep *orcv1alpha1.{{ . }}) bool { return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil },
orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(rs)
{{- end }}
Expand Down Expand Up @@ -145,25 +145,21 @@ func (actuator {{ .PackageName }}Actuator) CreateResource(ctx context.Context, o
{{- range .RequiredCreateDependencies }}
{{ $depNameCamelCase := . | camelCase }}
var {{ $depNameCamelCase }}ID string
{{ $depNameCamelCase }}, {{ $depNameCamelCase }}DepRS := {{ $depNameCamelCase }}Dependency.GetDependency(
ctx, actuator.k8sClient, obj, func(dep *orcv1alpha1.{{ . }}) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
)
reconcileStatus = reconcileStatus.WithReconcileStatus({{ $depNameCamelCase }}DepRS)
if {{ $depNameCamelCase }} != nil {
{{ $depNameCamelCase }}ID = ptr.Deref({{ $depNameCamelCase }}.Status.ID, "")
}
{{ $depNameCamelCase }}, {{ $depNameCamelCase }}DepRS := {{ $depNameCamelCase }}Dependency.GetDependency(
ctx, actuator.k8sClient, obj, orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus({{ $depNameCamelCase }}DepRS)
if {{ $depNameCamelCase }} != nil {
{{ $depNameCamelCase }}ID = ptr.Deref({{ $depNameCamelCase }}.Status.ID, "")
}

{{- end }}
{{- range .OptionalCreateDependencies }}
{{ $depNameCamelCase := . | camelCase }}
var {{ $depNameCamelCase }}ID string
if resource.{{ . }}Ref != nil {
{{ $depNameCamelCase }}, {{ $depNameCamelCase }}DepRS := {{ $depNameCamelCase }}Dependency.GetDependency(
ctx, actuator.k8sClient, obj, func(dep *orcv1alpha1.{{ . }}) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
ctx, actuator.k8sClient, obj, orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus({{ $depNameCamelCase }}DepRS)
if {{ $depNameCamelCase }} != nil {
Expand Down
34 changes: 10 additions & 24 deletions internal/controllers/floatingip/actuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,27 +88,21 @@ func (actuator floatingipActuator) ListOSResourcesForAdoption(ctx context.Contex
func (actuator floatingipCreateActuator) ListOSResourcesForImport(ctx context.Context, obj orcObjectPT, filter filterT) (iter.Seq2[*osResourceT, error], progress.ReconcileStatus) {
var reconcileStatus progress.ReconcileStatus

network, rs := dependency.FetchDependency(
network, rs := dependency.FetchDependency[*orcv1alpha1.Network](
ctx, actuator.k8sClient, obj.Namespace, filter.FloatingNetworkRef, "Network",
func(dep *orcv1alpha1.Network) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(rs)

port, rs := dependency.FetchDependency(
port, rs := dependency.FetchDependency[*orcv1alpha1.Port](
ctx, actuator.k8sClient, obj.Namespace, filter.PortRef, "Port",
func(dep *orcv1alpha1.Port) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(rs)

project, rs := dependency.FetchDependency(
project, rs := dependency.FetchDependency[*orcv1alpha1.Project](
ctx, actuator.k8sClient, obj.Namespace, filter.ProjectRef, "Project",
func(dep *orcv1alpha1.Project) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(rs)

Expand Down Expand Up @@ -145,9 +139,7 @@ func (actuator floatingipCreateActuator) CreateResource(ctx context.Context, obj
if resource.FloatingNetworkRef != nil {
// Fetch dependencies and ensure they have our finalizer
network, networkDepRS := networkDep.GetDependency(
ctx, actuator.k8sClient, obj, func(dep *orcv1alpha1.Network) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
ctx, actuator.k8sClient, obj, orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(networkDepRS)
if network != nil {
Expand All @@ -160,9 +152,7 @@ func (actuator floatingipCreateActuator) CreateResource(ctx context.Context, obj
if resource.FloatingSubnetRef != nil {
// Fetch dependencies and ensure they have our finalizer
subnet, subnetDepRS := subnetDep.GetDependency(
ctx, actuator.k8sClient, obj, func(dep *orcv1alpha1.Subnet) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
ctx, actuator.k8sClient, obj, orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(subnetDepRS)
if subnet != nil {
Expand All @@ -175,9 +165,7 @@ func (actuator floatingipCreateActuator) CreateResource(ctx context.Context, obj
if resource.PortRef != nil {
// Fetch dependencies and ensure they have our finalizer
port, portDepRS := portDep.GetDependency(
ctx, actuator.k8sClient, obj, func(dep *orcv1alpha1.Port) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
ctx, actuator.k8sClient, obj, orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(portDepRS)
if port != nil {
Expand All @@ -188,9 +176,7 @@ func (actuator floatingipCreateActuator) CreateResource(ctx context.Context, obj
var projectID string
if resource.ProjectRef != nil {
project, projectDepRS := projectDependency.GetDependency(
ctx, actuator.k8sClient, obj, func(dep *orcv1alpha1.Project) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
ctx, actuator.k8sClient, obj, orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(projectDepRS)
if project != nil {
Expand Down
10 changes: 3 additions & 7 deletions internal/controllers/group/actuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,9 @@ func (actuator groupActuator) ListOSResourcesForImport(ctx context.Context, obj

var reconcileStatus progress.ReconcileStatus

domain, rs := dependency.FetchDependency(
domain, rs := dependency.FetchDependency[*orcv1alpha1.Domain](
ctx, actuator.k8sClient, obj.Namespace, filter.DomainRef, "Domain",
func(dep *orcv1alpha1.Domain) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(rs)

Expand Down Expand Up @@ -115,9 +113,7 @@ func (actuator groupActuator) CreateResource(ctx context.Context, obj orcObjectP
var domainID string
if resource.DomainRef != nil {
domain, domainDepRS := domainDependency.GetDependency(
ctx, actuator.k8sClient, obj, func(dep *orcv1alpha1.Domain) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
ctx, actuator.k8sClient, obj, orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(domainDepRS)
if domain != nil {
Expand Down
10 changes: 3 additions & 7 deletions internal/controllers/network/actuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,9 @@ func (actuator networkActuator) ListOSResourcesForAdoption(ctx context.Context,
func (actuator networkActuator) ListOSResourcesForImport(ctx context.Context, obj orcObjectPT, filter filterT) (iter.Seq2[*osResourceT, error], progress.ReconcileStatus) {
var reconcileStatus progress.ReconcileStatus

project, rs := dependency.FetchDependency(
project, rs := dependency.FetchDependency[*orcv1alpha1.Project](
ctx, actuator.k8sClient, obj.Namespace, filter.ProjectRef, "Project",
func(dep *orcv1alpha1.Project) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(rs)

Expand Down Expand Up @@ -118,9 +116,7 @@ func (actuator networkActuator) CreateResource(ctx context.Context, obj orcObjec
var projectID string
if resource.ProjectRef != nil {
project, reconcileStatus := projectDependency.GetDependency(
ctx, actuator.k8sClient, obj, func(dep *orcv1alpha1.Project) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
ctx, actuator.k8sClient, obj, orcv1alpha1.IsAvailable,
)
if needsReschedule, _ := reconcileStatus.NeedsReschedule(); needsReschedule {
return nil, reconcileStatus
Expand Down
32 changes: 9 additions & 23 deletions internal/controllers/port/actuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,19 +128,15 @@ func (actuator portActuator) ListOSResourcesForAdoption(ctx context.Context, obj
func (actuator portActuator) ListOSResourcesForImport(ctx context.Context, obj orcObjectPT, filter filterT) (iter.Seq2[*osResourceT, error], progress.ReconcileStatus) {
var reconcileStatus progress.ReconcileStatus

network, rs := dependency.FetchDependency(
network, rs := dependency.FetchDependency[*orcv1alpha1.Network](
ctx, actuator.k8sClient, obj.Namespace, &filter.NetworkRef, "Network",
func(dep *orcv1alpha1.Network) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(rs)

project, rs := dependency.FetchDependency(
project, rs := dependency.FetchDependency[*orcv1alpha1.Project](
ctx, actuator.k8sClient, obj.Namespace, filter.ProjectRef, "Project",
func(dep *orcv1alpha1.Project) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(rs)

Expand Down Expand Up @@ -173,19 +169,13 @@ func (actuator portActuator) CreateResource(ctx context.Context, obj *orcv1alpha

// Fetch all dependencies and ensure they have our finalizer
network, networkDepRS := networkDependency.GetDependency(
ctx, actuator.k8sClient, obj, func(dep *orcv1alpha1.Network) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
ctx, actuator.k8sClient, obj, orcv1alpha1.IsAvailable,
)
subnetMap, subnetDepRS := subnetDependency.GetDependencies(
ctx, actuator.k8sClient, obj, func(dep *orcv1alpha1.Subnet) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
ctx, actuator.k8sClient, obj, orcv1alpha1.IsAvailable,
)
secGroupMap, secGroupDepRS := securityGroupDependency.GetDependencies(
ctx, actuator.k8sClient, obj, func(dep *orcv1alpha1.SecurityGroup) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
ctx, actuator.k8sClient, obj, orcv1alpha1.IsAvailable,
)
reconcileStatus := progress.NewReconcileStatus().
WithReconcileStatus(networkDepRS).
Expand All @@ -195,9 +185,7 @@ func (actuator portActuator) CreateResource(ctx context.Context, obj *orcv1alpha
var projectID string
if resource.ProjectRef != nil {
project, projectDepRS := projectDependency.GetDependency(
ctx, actuator.k8sClient, obj, func(dep *orcv1alpha1.Project) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
ctx, actuator.k8sClient, obj, orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(projectDepRS)
if project != nil {
Expand Down Expand Up @@ -369,9 +357,7 @@ func (actuator portActuator) updateResource(ctx context.Context, obj orcObjectPT
}

secGroupMap, secGroupDepRS := securityGroupDependency.GetDependencies(
ctx, actuator.k8sClient, obj, func(dep *orcv1alpha1.SecurityGroup) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
ctx, actuator.k8sClient, obj, orcv1alpha1.IsAvailable,
)

reconcileStatus := progress.NewReconcileStatus().
Expand Down
10 changes: 3 additions & 7 deletions internal/controllers/role/actuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,9 @@ func (actuator roleActuator) ListOSResourcesForAdoption(ctx context.Context, orc
func (actuator roleActuator) ListOSResourcesForImport(ctx context.Context, obj orcObjectPT, filter filterT) (iter.Seq2[*osResourceT, error], progress.ReconcileStatus) {
var reconcileStatus progress.ReconcileStatus

domain, rs := dependency.FetchDependency(
domain, rs := dependency.FetchDependency[*orcv1alpha1.Domain](
ctx, actuator.k8sClient, obj.Namespace, filter.DomainRef, "Domain",
func(dep *orcv1alpha1.Domain) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(rs)

Expand Down Expand Up @@ -114,9 +112,7 @@ func (actuator roleActuator) CreateResource(ctx context.Context, obj orcObjectPT
var domainID string
if resource.DomainRef != nil {
domain, domainDepRS := domainDependency.GetDependency(
ctx, actuator.k8sClient, obj, func(dep *orcv1alpha1.Domain) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
ctx, actuator.k8sClient, obj, orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(domainDepRS)
if domain != nil {
Expand Down
14 changes: 4 additions & 10 deletions internal/controllers/router/actuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,9 @@ func (actuator routerActuator) ListOSResourcesForAdoption(ctx context.Context, o
func (actuator routerCreateActuator) ListOSResourcesForImport(ctx context.Context, obj orcObjectPT, filter filterT) (iter.Seq2[*osResourceT, error], progress.ReconcileStatus) {
var reconcileStatus progress.ReconcileStatus

project, rs := dependency.FetchDependency(
project, rs := dependency.FetchDependency[*orcv1alpha1.Project](
ctx, actuator.k8sClient, obj.Namespace, filter.ProjectRef, "Project",
func(dep *orcv1alpha1.Project) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(rs)

Expand Down Expand Up @@ -123,9 +121,7 @@ func (actuator routerCreateActuator) CreateResource(ctx context.Context, obj *or
var externalGW *orcv1alpha1.Network
// Fetch dependencies and ensure they have our finalizer
externalGW, reconcileStatus = externalGWDep.GetDependency(
ctx, actuator.k8sClient, obj, func(dep *orcv1alpha1.Network) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
ctx, actuator.k8sClient, obj, orcv1alpha1.IsAvailable,
)
if externalGW != nil {
gatewayInfo.NetworkID = ptr.Deref(externalGW.Status.ID, "")
Expand All @@ -135,9 +131,7 @@ func (actuator routerCreateActuator) CreateResource(ctx context.Context, obj *or
var projectID string
if resource.ProjectRef != nil {
project, projectDepRS := projectDependency.GetDependency(
ctx, actuator.k8sClient, obj, func(dep *orcv1alpha1.Project) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
ctx, actuator.k8sClient, obj, orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(projectDepRS)
if project != nil {
Expand Down
14 changes: 4 additions & 10 deletions internal/controllers/securitygroup/actuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,9 @@ func (actuator securityGroupActuator) ListOSResourcesForAdoption(ctx context.Con
func (actuator securityGroupActuator) ListOSResourcesForImport(ctx context.Context, obj orcObjectPT, filter filterT) (iter.Seq2[*osResourceT, error], progress.ReconcileStatus) {
var reconcileStatus progress.ReconcileStatus

project, rs := dependency.FetchDependency(
project, rs := dependency.FetchDependency[*orcv1alpha1.Project](
ctx, actuator.k8sClient, obj.Namespace, filter.ProjectRef, "Project",
func(dep *orcv1alpha1.Project) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
orcv1alpha1.IsAvailable,
)
reconcileStatus = reconcileStatus.WithReconcileStatus(rs)

Expand Down Expand Up @@ -123,9 +121,7 @@ func (actuator securityGroupActuator) CreateResource(ctx context.Context, obj *o
var projectID string
if resource.ProjectRef != nil {
project, reconcileStatus := projectDependency.GetDependency(
ctx, actuator.k8sClient, obj, func(dep *orcv1alpha1.Project) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
ctx, actuator.k8sClient, obj, orcv1alpha1.IsAvailable,
)
if needsReschedule, _ := reconcileStatus.NeedsReschedule(); needsReschedule {
return nil, reconcileStatus
Expand Down Expand Up @@ -280,9 +276,7 @@ func (actuator securityGroupActuator) updateRules(ctx context.Context, orcObject
var projectID string
if resource.ProjectRef != nil {
project, reconcileStatus := projectDependency.GetDependency(
ctx, actuator.k8sClient, orcObject, func(dep *orcv1alpha1.Project) bool {
return orcv1alpha1.IsAvailable(dep) && dep.Status.ID != nil
},
ctx, actuator.k8sClient, orcObject, orcv1alpha1.IsAvailable,
)
if needsReschedule, _ := reconcileStatus.NeedsReschedule(); needsReschedule {
return reconcileStatus
Expand Down
Loading
Loading