Skip to content

Switch to controller-runtime SSA for resource management #318

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

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Switch to controller-runtime SSA for resource management #318

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e75f03f
Initial plan
Copilot Aug 14, 2025
a9cee66
Implement server-side apply (SSA) for resource management
Copilot Aug 14, 2025
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
54 changes: 4 additions & 50 deletions controllers/gitopsset_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"github.com/gitops-tools/pkg/sets"
"github.com/go-logr/logr"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down Expand Up @@ -249,41 +248,14 @@ func (r *GitOpsSetReconciler) renderAndReconcile(ctx context.Context, logger log
continue
}

if existingEntries.Has(ref) {
existing, err := unstructuredFromResourceRef(ref)
if err != nil {
inventoryErr = errors.Join(inventoryErr, fmt.Errorf("failed to convert resource for update: %w", err))
continue
}
// We can add the entry because we know it exists
entries.Insert(ref)
err = k8sClient.Get(ctx, client.ObjectKeyFromObject(newResource), existing)
if err == nil {
newResource = copyUnstructuredContent(existing, newResource)
if err := k8sClient.Patch(ctx, newResource, client.MergeFrom(existing)); err != nil {
inventoryErr = errors.Join(inventoryErr, fmt.Errorf("failed to update Resource: %w", err))
}
continue
}

if !apierrors.IsNotFound(err) {
inventoryErr = errors.Join(inventoryErr, fmt.Errorf("failed to load existing Resource: %w", err))
continue
}
}

if err := logResourceMessage(logger, "creating new resource", newResource); err != nil {
// Use server-side apply for both create and update operations
if err := logResourceMessage(logger, "applying resource", newResource); err != nil {
inventoryErr = errors.Join(inventoryErr, err)
continue
}

if err := k8sClient.Create(ctx, newResource); err != nil {
inventoryErr = errors.Join(inventoryErr, fmt.Errorf("failed to create Resource: %w", err))
if apierrors.IsAlreadyExists(err) {
if err := logResourceMessage(logger, "resource already exists", newResource); err != nil {
inventoryErr = errors.Join(inventoryErr, err)
}
}
if err := k8sClient.Patch(ctx, newResource, client.Apply, client.FieldOwner("gitopssets-controller")); err != nil {
inventoryErr = errors.Join(inventoryErr, fmt.Errorf("failed to apply Resource: %w", err))
continue
}

Expand Down Expand Up @@ -698,24 +670,6 @@ func unstructuredFromResourceRef(ref templatesv1.ResourceRef) (*unstructured.Uns
return &u, nil
}

func copyUnstructuredContent(existing, newValue *unstructured.Unstructured) *unstructured.Unstructured {
result := unstructured.Unstructured{}
existing.DeepCopyInto(&result)

disallowedKeys := sets.New("status", "metadata", "kind", "apiVersion")

for k, v := range newValue.Object {
if !disallowedKeys.Has(k) {
result.Object[k] = v
}
}

result.SetAnnotations(newValue.GetAnnotations())
result.SetLabels(newValue.GetLabels())

return &result
}

func logResourceMessage(logger logr.Logger, msg string, obj runtime.Object) error {
namespace, err := accessor.Namespace(obj)
if err != nil {
Expand Down