Skip to content

[0.13] Explicitly delete bundle secrets on bundle deletion #4216

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 1 commit into from
Oct 21, 2025
Merged

[0.13] Explicitly delete bundle secrets on bundle deletion #4216

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
1 change: 1 addition & 0 deletions internal/cmd/cli/apply/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@ func writeBundle(ctx context.Context, c client.Client, r record.EventRecorder, b
valuesSecret := newValuesSecret(bundle, data)
updated := valuesSecret.DeepCopy()
_, err = controllerutil.CreateOrUpdate(ctx, c, valuesSecret, func() error {
valuesSecret.OwnerReferences = updated.OwnerReferences
valuesSecret.Labels = updated.Labels
valuesSecret.Data = updated.Data
valuesSecret.Type = updated.Type
Expand Down
23 changes: 20 additions & 3 deletions internal/cmd/controller/reconciler/bundle_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/client-go/tools/record"
"k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -447,6 +448,11 @@ func (r *BundleReconciler) handleDelete(ctx context.Context, logger logr.Logger,
return ctrl.Result{}, err
}

// pro-actively delete the bundle's secret. k8s owner garbage collection will handle remaining orphans.
if err := r.Delete(ctx, &corev1.Secret{ObjectMeta: metav1.ObjectMeta{Name: bundle.Name, Namespace: bundle.Namespace}}); err != nil && !apierrors.IsNotFound(err) {
logger.V(1).Info("Cannot delete bundle's values secret, owner garbage collection will remove it")
}

return ctrl.Result{}, r.maybeDeleteOCIArtifact(ctx, bundle)
}

Expand Down Expand Up @@ -552,12 +558,19 @@ func (r *BundleReconciler) createOptionsSecret(ctx context.Context, bd *fleet.Bu
Namespace: bd.Namespace,
},
}

if err := controllerutil.SetControllerReference(bd, secret, r.Scheme); err != nil {
return err
owners := []metav1.OwnerReference{
{
APIVersion: fleet.SchemeGroupVersion.String(),
Kind: "BundleDeployment",
Name: bd.GetName(),
UID: bd.GetUID(),
BlockOwnerDeletion: ptr.To(true),
Controller: ptr.To(true),
},
}

if _, err := controllerutil.CreateOrUpdate(ctx, r.Client, secret, func() error {
secret.OwnerReferences = owners
secret.Data = map[string][]byte{
helmvalues.ValuesKey: options,
helmvalues.StagedValuesKey: stagedOptions,
Expand Down Expand Up @@ -743,6 +756,10 @@ func batchDeleteBundleDeployments(ctx context.Context, c client.Client, list []f
if err := c.Delete(ctx, &bd); client.IgnoreNotFound(err) != nil {
errs = append(errs, err)
}

// k8s ownership garbage collection can take a long time, so we explicitly delete the secrets here.
// GC will delete any remaining orphaned secrets, no need to add an error.
_ = c.Delete(ctx, &corev1.Secret{ObjectMeta: metav1.ObjectMeta{Name: bd.Name, Namespace: bd.Namespace}})
}

return errors.Join(errs...)
Expand Down
Loading