Replacing NMC's controller watch object.

We should watch for builds and not for jobs as we are not using jobs in this project. Signed-off-by: Yoni Bettan <[email protected]>
rh-ecosystem-edge · Aug 22, 2023 · f130493 · f130493
1 parent 8baa8d6
commit f130493
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/controllers/module_nmc_reconciler.go b/controllers/module_nmc_reconciler.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/go-multierror"
+	buildv1 "github.com/openshift/api/build/v1"
 	kmmv1beta1 "github.com/rh-ecosystem-edge/kernel-module-management/api/v1beta1"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/api"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/auth"
@@ -16,7 +17,6 @@ import (
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/nmc"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/registry"
 	"github.com/rh-ecosystem-edge/kernel-module-management/internal/utils"
-	batchv1 "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -290,7 +290,7 @@ func (mnr *ModuleNMCReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		NewControllerManagedBy(mgr).
 		For(&kmmv1beta1.Module{}).
 		Owns(&kmmv1beta1.NodeModulesConfig{}).
-		Owns(&batchv1.Job{}, builder.WithPredicates(filter.ModuleNMCReconcileJobPredicate())).
+		Owns(&buildv1.Build{}, builder.WithPredicates(filter.ModuleNMCReconcileBuildPredicate())).
 		Watches(
 			&v1.Node{},
 			handler.EnqueueRequestsFromMapFunc(mnr.filter.FindModulesForNMCNodeChange),

diff --git a/internal/filter/filter.go b/internal/filter/filter.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/go-logr/logr"
 	imagev1 "github.com/openshift/api/image/v1"
-	batchv1 "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -83,13 +82,13 @@ var kmmClusterClaimChanged predicate.Predicate = predicate.Funcs{
 	},
 }
 
-var moduleJobSuccess predicate.Predicate = predicate.Funcs{
+var moduleBuildSuccess predicate.Predicate = predicate.Funcs{
 	UpdateFunc: func(e event.UpdateEvent) bool {
-		job, ok := e.ObjectNew.(*batchv1.Job)
+		build, ok := e.ObjectNew.(*buildv1.Build)
 		if !ok {
 			return true
 		}
-		if job.Status.Succeeded == 1 {
+		if build.Status.Phase == buildv1.BuildPhaseComplete {
 			return true
 		}
 
@@ -133,11 +132,11 @@ func ModuleNMCReconcilerNodePredicate() predicate.Predicate {
 	)
 }
 
-func ModuleNMCReconcileJobPredicate() predicate.Predicate {
+func ModuleNMCReconcileBuildPredicate() predicate.Predicate {
 	return predicate.And(
 		skipDeletions,
 		skipCreations,
-		moduleJobSuccess,
+		moduleBuildSuccess,
 	)
 }