Skip to content

Trigger reconciliation of owner if change in controlled resource is detected #22

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

Merged
merged 2 commits into from
Sep 6, 2024
Merged

Trigger reconciliation of owner if change in controlled resource is detected #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6709674
use owner reference with reference to controller
bruelea Sep 4, 2024
5a72002
remove replace remaining SetOwnerReference() calls
bruelea Sep 5, 2024
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
45 changes: 0 additions & 45 deletions api/v1/prefixclaim_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ limitations under the License.
package v1

import (
"strings"

"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down Expand Up @@ -93,48 +90,6 @@ func init() {
SchemeBuilder.Register(&PrefixClaim{}, &PrefixClaimList{})
}

func (r *PrefixClaim) GeneratePrefixSpec(prefix string) PrefixSpec {
return PrefixSpec{
Prefix: prefix,
Site: r.Spec.Site,
Tenant: r.Spec.Tenant,
Description: r.Spec.Description,
Comments: r.Spec.Comments,
}
}

func (r *PrefixClaim) GeneratePrefix(prefix string) *Prefix {
prefixResource := &Prefix{
TypeMeta: metav1.TypeMeta{
Kind: "Prefix",
APIVersion: "netbox.dev/v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: r.GetPrefixName(),
Namespace: r.ObjectMeta.Namespace,
},
Spec: r.GeneratePrefixSpec(prefix),
}
owner := []metav1.OwnerReference{
{
APIVersion: r.APIVersion,
Kind: r.Kind,
Name: r.Name,
UID: r.UID,
},
}
prefixResource.SetOwnerReferences(owner)
return prefixResource
}

func (r *PrefixClaim) GetPrefixName() string {
if len(r.ObjectMeta.UID) == 0 {
panic(errors.New("UUID not provided in PrefixClaim resource"))
}
splitted_uid := strings.Split(string(r.ObjectMeta.UID), "-")
return r.ObjectMeta.Name + "-" + splitted_uid[0]
}

var ConditionPrefixClaimReadyTrue = metav1.Condition{
Type: "Ready",
Status: "True",
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/ipaddressclaim_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ func (r *IpAddressClaimReconciler) Reconcile(ctx context.Context, req ctrl.Reque

// 6.a create the IPAddress object
ipAddressResource := generateIpAddressFromIpAddressClaim(o, ipAddressModel.IpAddress)
err = controllerutil.SetOwnerReference(o, ipAddressResource, r.Scheme)
err = controllerutil.SetControllerReference(o, ipAddressResource, r.Scheme)
if err != nil {
return ctrl.Result{}, err
}
Expand Down
5 changes: 0 additions & 5 deletions internal/controller/ipaddressclaim_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,6 @@ var _ = Describe("IpAddressClaim Controller", Ordered, func() {

// check that the ip address claim controller created the ip address CR with correct spec
Expect(createdIpCR.Spec).To(Equal(ipcr.Spec))

// Change status of claim to trigger reconciliation (watch on ip address doesn't cause automatic reconciliation with env test)
Expect(k8sClient.Get(ctx, types.NamespacedName{Name: cr.GetName(), Namespace: cr.GetNamespace()}, createdCR)).To(Succeed())
apismeta.SetStatusCondition(&cr.Status.Conditions, netboxv1.ConditionIpClaimReadyFalse)
Expect(k8sClient.Status().Update(ctx, createdCR)).To(Succeed())
}

// Now check if conditions are set as expected
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/prefixclaim_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ func (r *PrefixClaimReconciler) Reconcile(ctx context.Context, req ctrl.Request)

/* 6-1, create the Prefix object */
prefixResource := generatePrefixFromPrefixClaim(prefixClaim, prefixModel.Prefix)
err = controllerutil.SetOwnerReference(prefixClaim, prefixResource, r.Scheme)
err = controllerutil.SetControllerReference(prefixClaim, prefixResource, r.Scheme)
if err != nil {
return ctrl.Result{}, err
}
Expand Down