Skip to content

feat: nnc client sets ownerref #1133

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 3 commits into from
Nov 30, 2021
Merged

feat: nnc client sets ownerref #1133

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4dfa1e
feat: nnc client sets ownerref
thatmattlong Nov 19, 2021
9a2a46e
fix: linter issues
thatmattlong Nov 29, 2021
0a30609
fix: don't use unnecessary custom error type
thatmattlong Nov 29, 2021
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
16 changes: 16 additions & 0 deletions crd/nodenetworkconfig/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package nodenetworkconfig

import (
"context"
"fmt"
"reflect"

"github.com/Azure/azure-container-networking/crd"
Expand All @@ -16,6 +17,7 @@ import (
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
ctrlcli "sigs.k8s.io/controller-runtime/pkg/client"
ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
)

// Scheme is a runtime scheme containing the client-go scheme and the NodeNetworkConfig scheme.
Expand Down Expand Up @@ -136,3 +138,17 @@ func (c *Client) UpdateSpec(ctx context.Context, key types.NamespacedName, spec
}
return nnc, nil
}

// SetOwnerRef sets the owner of the NodeNetworkConfig to the given object, using HTTP Patch
func (c *Client) SetOwnerRef(ctx context.Context, nnc *v1alpha.NodeNetworkConfig, owner metav1.Object) (*v1alpha.NodeNetworkConfig, error) {
newNNC := nnc.DeepCopy()
Copy link
Collaborator

@rbtr rbtr Nov 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should either return the newNNC or mutate the passed nnc, since the patch call will write the resultant object to the ref it gets passed.

Copy link
Collaborator Author

@thatmattlong thatmattlong Nov 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good point, I'll change that

Copy link
Collaborator Author

@thatmattlong thatmattlong Nov 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

decided to return instead of mutate since the nnccli.Patch() could fail and we don't want to mutate the caller if we dn't actually make a successful change

if err := ctrlutil.SetControllerReference(owner, newNNC, Scheme); err != nil {
return nil, fmt.Errorf("could not set controller reference for NNC %s/%s: %w", nnc.Namespace, nnc.Name, err)
}

if err := c.nnccli.Patch(ctx, newNNC, ctrlcli.MergeFrom(nnc)); err != nil {
return nil, fmt.Errorf("could not patch NNC %s/%s: %w", nnc.Namespace, nnc.Name, err)
}

return newNNC, nil
}