Rename RepositoryChange to SourceChange predicate
This commit is contained in:
parent
e9c3aab0c3
commit
629da726c6
|
@ -101,7 +101,7 @@ func (r *GitRepositoryReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
|
||||||
func (r *GitRepositoryReconciler) SetupWithManager(mgr ctrl.Manager) error {
|
func (r *GitRepositoryReconciler) SetupWithManager(mgr ctrl.Manager) error {
|
||||||
return ctrl.NewControllerManagedBy(mgr).
|
return ctrl.NewControllerManagedBy(mgr).
|
||||||
For(&sourcev1.GitRepository{}).
|
For(&sourcev1.GitRepository{}).
|
||||||
WithEventFilter(RepositoryChangePredicate{}).
|
WithEventFilter(SourceChangePredicate{}).
|
||||||
WithEventFilter(predicate.Funcs{
|
WithEventFilter(predicate.Funcs{
|
||||||
DeleteFunc: func(e event.DeleteEvent) bool {
|
DeleteFunc: func(e event.DeleteEvent) bool {
|
||||||
gvk, err := apiutil.GVKForObject(e.Object, r.Scheme)
|
gvk, err := apiutil.GVKForObject(e.Object, r.Scheme)
|
||||||
|
|
|
@ -77,6 +77,7 @@ func (r *HelmChartReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
|
||||||
// try to remove old artifacts
|
// try to remove old artifacts
|
||||||
r.gc(chart)
|
r.gc(chart)
|
||||||
|
|
||||||
|
// get referenced chart repository
|
||||||
repository, err := r.chartRepository(ctx, chart)
|
repository, err := r.chartRepository(ctx, chart)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
chart = sourcev1.HelmChartNotReady(*chart.DeepCopy(), sourcev1.ChartPullFailedReason, err.Error())
|
chart = sourcev1.HelmChartNotReady(*chart.DeepCopy(), sourcev1.ChartPullFailedReason, err.Error())
|
||||||
|
@ -108,7 +109,7 @@ func (r *HelmChartReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
|
||||||
func (r *HelmChartReconciler) SetupWithManager(mgr ctrl.Manager) error {
|
func (r *HelmChartReconciler) SetupWithManager(mgr ctrl.Manager) error {
|
||||||
return ctrl.NewControllerManagedBy(mgr).
|
return ctrl.NewControllerManagedBy(mgr).
|
||||||
For(&sourcev1.HelmChart{}).
|
For(&sourcev1.HelmChart{}).
|
||||||
WithEventFilter(RepositoryChangePredicate{}).
|
WithEventFilter(SourceChangePredicate{}).
|
||||||
WithEventFilter(predicate.Funcs{
|
WithEventFilter(predicate.Funcs{
|
||||||
DeleteFunc: func(e event.DeleteEvent) bool {
|
DeleteFunc: func(e event.DeleteEvent) bool {
|
||||||
gvk, err := apiutil.GVKForObject(e.Object, r.Scheme)
|
gvk, err := apiutil.GVKForObject(e.Object, r.Scheme)
|
||||||
|
@ -236,6 +237,7 @@ func (r *HelmChartReconciler) chartRepository(ctx context.Context, chart sourcev
|
||||||
err := r.Client.Get(ctx, name, &repository)
|
err := r.Client.Get(ctx, name, &repository)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
err = fmt.Errorf("failed to get HelmRepository '%s': %w", name, err)
|
err = fmt.Errorf("failed to get HelmRepository '%s': %w", name, err)
|
||||||
|
return repository, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if repository.Status.Artifact == nil {
|
if repository.Status.Artifact == nil {
|
||||||
|
|
|
@ -97,7 +97,7 @@ func (r *HelmRepositoryReconciler) Reconcile(req ctrl.Request) (ctrl.Result, err
|
||||||
func (r *HelmRepositoryReconciler) SetupWithManager(mgr ctrl.Manager) error {
|
func (r *HelmRepositoryReconciler) SetupWithManager(mgr ctrl.Manager) error {
|
||||||
return ctrl.NewControllerManagedBy(mgr).
|
return ctrl.NewControllerManagedBy(mgr).
|
||||||
For(&sourcev1.HelmRepository{}).
|
For(&sourcev1.HelmRepository{}).
|
||||||
WithEventFilter(RepositoryChangePredicate{}).
|
WithEventFilter(SourceChangePredicate{}).
|
||||||
WithEventFilter(predicate.Funcs{
|
WithEventFilter(predicate.Funcs{
|
||||||
DeleteFunc: func(e event.DeleteEvent) bool {
|
DeleteFunc: func(e event.DeleteEvent) bool {
|
||||||
gvk, err := apiutil.GVKForObject(e.Object, r.Scheme)
|
gvk, err := apiutil.GVKForObject(e.Object, r.Scheme)
|
||||||
|
|
|
@ -21,12 +21,12 @@ import (
|
||||||
"sigs.k8s.io/controller-runtime/pkg/predicate"
|
"sigs.k8s.io/controller-runtime/pkg/predicate"
|
||||||
)
|
)
|
||||||
|
|
||||||
type RepositoryChangePredicate struct {
|
type SourceChangePredicate struct {
|
||||||
predicate.Funcs
|
predicate.Funcs
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update implements default UpdateEvent filter for validating repository change
|
// Update implements default UpdateEvent filter for validating repository change
|
||||||
func (RepositoryChangePredicate) Update(e event.UpdateEvent) bool {
|
func (SourceChangePredicate) Update(e event.UpdateEvent) bool {
|
||||||
if e.MetaOld == nil || e.MetaNew == nil {
|
if e.MetaOld == nil || e.MetaNew == nil {
|
||||||
// ignore objects without metadata
|
// ignore objects without metadata
|
||||||
return false
|
return false
|
||||||
|
|
Loading…
Reference in New Issue