fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #91 from fluxcd/enhancement/remove-owner-ref 

Remove HelmRepository owner ref on HelmChart
This commit is contained in:
Hidde Beydals 2020-07-16 13:01:35 +02:00 committed by GitHub
parent 70b095dccd ba3ed63a9d
commit 96c29a89b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
controllers/helmchart_controller.go
View File

@ -98,12 +98,6 @@ func (r *HelmChartReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
return ctrl.Result{Requeue: true}, err return ctrl.Result{Requeue: true}, err
} }
// set ownership reference so chart is garbage collected on
// repository removal
if err := r.setOwnerRef(ctx, &chart, repository); err != nil {
log.Error(err, "unable to set owner reference")
}
// reconcile repository by downloading the chart tarball // reconcile repository by downloading the chart tarball
reconciledChart, reconcileErr := r.reconcile(ctx, repository, *chart.DeepCopy()) reconciledChart, reconcileErr := r.reconcile(ctx, repository, *chart.DeepCopy())
@ -328,18 +322,6 @@ func (r *HelmChartReconciler) gc(chart sourcev1.HelmChart) error {
return nil return nil
} }
// setOwnerRef appends the owner reference of the given chart to the
// repository if it is not present.
func (r *HelmChartReconciler) setOwnerRef(ctx context.Context, chart *sourcev1.HelmChart, repository sourcev1.HelmRepository) error {
if metav1.IsControlledBy(chart.GetObjectMeta(), repository.GetObjectMeta()) {
return nil
}
chart.SetOwnerReferences(append(chart.GetOwnerReferences(), *metav1.NewControllerRef(
repository.GetObjectMeta(), repository.GroupVersionKind(),
)))
return r.Update(ctx, chart)
}
// event emits a Kubernetes event and forwards the event to notification controller if configured // event emits a Kubernetes event and forwards the event to notification controller if configured
func (r *HelmChartReconciler) event(chart sourcev1.HelmChart, severity, msg string) { func (r *HelmChartReconciler) event(chart sourcev1.HelmChart, severity, msg string) {
if r.EventRecorder != nil { if r.EventRecorder != nil {