Skip to content

KRA-1058 enhance error reporting and status updates #160

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
matteogastaldello merged 2 commits into from
Dec 19, 2025
Merged

KRA-1058 enhance error reporting and status updates #160

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6fde25
feat: enhance error reporting and status updates in RBAC and helm cha…
matteogastaldello Dec 18, 2025
b35e878
feat: improve error reporting in RBAC and helm chart operations
matteogastaldello Dec 19, 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
31 changes: 29 additions & 2 deletions internal/composition/composition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@ import (
"path/filepath"
"time"

"github.com/krateoplatformops/unstructured-runtime/pkg/tools/unstructured/condition"

xcontext "github.com/krateoplatformops/unstructured-runtime/pkg/context"

"github.com/krateoplatformops/composition-dynamic-controller/internal/chartinspector"
compositionMeta "github.com/krateoplatformops/composition-dynamic-controller/internal/meta"
unstructuredtools "github.com/krateoplatformops/unstructured-runtime/pkg/tools/unstructured"

"github.com/krateoplatformops/composition-dynamic-controller/internal/helmclient"
"github.com/krateoplatformops/composition-dynamic-controller/internal/helmclient/tracer"
Expand Down Expand Up @@ -200,12 +203,28 @@ func (h *handler) Observe(ctx context.Context, mg *unstructured.Unstructured) (c
CompositionDefintionGVR: pkg.CompositionDefinitionInfo.GVR,
})
if err != nil {
retErr := fmt.Errorf("generating RBAC using chart-inspector: %w", err)
condition := condition.Unavailable()
condition.Message = retErr.Error()
unstructuredtools.SetConditions(mg, condition)
_, err = tools.UpdateStatus(ctx, mg, updateOpts)
if err != nil {
return controller.ExternalObservation{}, fmt.Errorf("updating status after failure: %w", err)
}
return controller.ExternalObservation{}, fmt.Errorf("generating RBAC using chart-inspector: %w", err)
}
rbInstaller := rbac.NewRBACInstaller(dyn)
err = rbInstaller.ApplyRBAC(generated)
if err != nil {
return controller.ExternalObservation{}, fmt.Errorf("installing rbac: %w", err)
retErr := fmt.Errorf("applying rbac: %w", err)
condition := condition.Unavailable()
condition.Message = retErr.Error()
unstructuredtools.SetConditions(mg, condition)
_, err = tools.UpdateStatus(ctx, mg, updateOpts)
if err != nil {
return controller.ExternalObservation{}, fmt.Errorf("updating status after failure: %w", err)
}
return controller.ExternalObservation{}, retErr
}

tracer := tracer.NewTracer(ctx, meta.IsVerbose(mg))
Expand Down Expand Up @@ -238,7 +257,15 @@ func (h *handler) Observe(ctx context.Context, mg *unstructured.Unstructured) (c

upgradedRel, err := helmchart.Update(ctx, opts)
if err != nil {
return controller.ExternalObservation{}, err
retErr := fmt.Errorf("updating helm chart: %w", err)
condition := condition.Unavailable()
condition.Message = retErr.Error()
unstructuredtools.SetConditions(mg, condition)
_, err = tools.UpdateStatus(ctx, mg, updateOpts)
if err != nil {
return controller.ExternalObservation{}, fmt.Errorf("updating status after failure: %w", err)
}
return controller.ExternalObservation{}, retErr
}

_, digest, err := helmchart.GetResourcesRefFromRelease(upgradedRel, mg.GetNamespace(), clientset)
Expand Down