Skip to content
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

fix: component reconciler test #130

Merged
merged 1 commit into from
Feb 25, 2025
Merged

fix: component reconciler test #130

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
46 changes: 41 additions & 5 deletions internal/controller/component/component_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"github.com/fluxcd/pkg/runtime/patch"
"github.com/mandelsoft/goutils/sliceutils"
"github.com/opencontainers/go-digest"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/types"
"ocm.software/ocm/api/datacontext"
Expand All @@ -49,6 +50,8 @@
"github.com/open-component-model/ocm-k8s-toolkit/pkg/status"
)

const SnapshotFinalizer = "snapshot-finalizer"

// Reconciler reconciles a Component object.
type Reconciler struct {
*ocm.BaseReconciler
Expand Down Expand Up @@ -120,6 +123,7 @@

// Reconcile the component object.
func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, retErr error) {
log.FromContext(ctx).Info("reconciling component", "name", req.Name)
component := &v1alpha1.Component{}
if err := r.Get(ctx, req.NamespacedName, component); err != nil {
return ctrl.Result{}, client.IgnoreNotFound(err)
Expand All @@ -144,10 +148,37 @@

func (r *Reconciler) reconcileExists(ctx context.Context, component *v1alpha1.Component) (_ ctrl.Result, retErr error) {
logger := log.FromContext(ctx)
if component.GetDeletionTimestamp() != nil {
if !component.GetDeletionTimestamp().IsZero() {

Check failure on line 151 in internal/controller/component/component_controller.go

View workflow job for this annotation

GitHub Actions / Check for diff 

`if !component.GetDeletionTimestamp().IsZero()` has complex nested blocks (complexity: 8) (nestif)
logger.Info("component is being deleted and cannot be used", "name", component.Name)

if component.Status.SnapshotRef.Name != "" {
snap := &v1alpha1.Snapshot{}
snap.SetNamespace(component.GetNamespace())
snap.SetName(component.Status.SnapshotRef.Name)
err := r.Get(ctx, client.ObjectKeyFromObject(snap), snap)
if err == nil {
err = r.Delete(ctx, snap)
}
if err != nil && !k8serrors.IsNotFound(err) {
return ctrl.Result{}, fmt.Errorf("failed to delete snapshot: %w", err)
}
logger.Info("referenced snapshot deleted", "name", snap.GetName())
}

if updated := controllerutil.RemoveFinalizer(component, SnapshotFinalizer); updated {
if err := r.Update(ctx, component); err != nil {
return ctrl.Result{}, fmt.Errorf("failed to remove finalizer: %w", err)
}
}

return ctrl.Result{Requeue: true}, nil
}

if updated := controllerutil.AddFinalizer(component, SnapshotFinalizer); updated {
if err := r.Update(ctx, component); err != nil {
return ctrl.Result{}, fmt.Errorf("failed to add finalizer: %w", err)
}
return ctrl.Result{Requeue: true}, nil

Check failure on line 181 in internal/controller/component/component_controller.go

View workflow job for this annotation

GitHub Actions / Check for diff 

return with no blank line before (nlreturn)
}

if component.Spec.Suspend {
Expand All @@ -172,9 +203,9 @@
return ctrl.Result{}, fmt.Errorf("failed to get repository: %w", err)
}

if repo.DeletionTimestamp != nil {
if !repo.DeletionTimestamp.IsZero() {
err := errors.New("repository is being deleted, please do not use it")
logger.Error(err, "repository is being deleted, please do not use it", "name", component.Spec.RepositoryRef.Name)
logger.Error(err, "waiting for deletion", "name", component.Spec.RepositoryRef.Name)

// Triggered through cache
return ctrl.Result{}, nil
Expand Down Expand Up @@ -330,22 +361,27 @@
Size: int64(len(descriptorsBytes)),
},
)
snapshotCopy := snapshotCR.DeepCopy()

if _, err = controllerutil.CreateOrUpdate(ctx, r.GetClient(), snapshotCR, func() error {
result, err := controllerutil.CreateOrUpdate(ctx, r.GetClient(), snapshotCR, func() error {
if err := controllerutil.SetControllerReference(component, snapshotCR, r.GetScheme()); err != nil {
return fmt.Errorf("failed to set controller reference: %w", err)
}

snapshotCR.Spec = snapshotCopy.Spec

component.Status.SnapshotRef = corev1.LocalObjectReference{
Name: snapshotCR.GetName(),
}

return nil
}); err != nil {
})
if err != nil {
status.MarkNotReady(r.EventRecorder, component, v1alpha1.CreateSnapshotFailedReason, err.Error())

return ctrl.Result{}, err
}
logger.Info(fmt.Sprintf("snapshot %s", result), "operation", result)

logger.Info("updating status")
component.Status.Component = v1alpha1.ComponentInfo{
Expand Down
Loading
Loading