crichardson/locust-operator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

comment out
Some checks failed
Lint / Run on Ubuntu (push) Failing after 1m7s
Details
Tests / Run on Ubuntu (push) Successful in 1m22s
Details
Build images / Build docker image (push) Successful in 3m11s
Details

Browse Source
This commit is contained in:
Chris Richardson
2025-07-03 15:26:55 -04:00
parent de84f86e35
commit 3a68d00970
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/main.go
View File

@@ -210,6 +210,7 @@ func main() {
ctx := context.Background() ctx := context.Background()
if err = (&controller.LocustClusterReconciler{ if err = (&controller.LocustClusterReconciler{
Client: mgr.GetClient(), Client: mgr.GetClient(),
Log: logger.WithName("controllers").WithName("LocustCluster"),
Scheme: mgr.GetScheme(), Scheme: mgr.GetScheme(),
}).SetupWithManager(mgr, ctx); err != nil { }).SetupWithManager(mgr, ctx); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "LocustCluster") setupLog.Error(err, "unable to create controller", "controller", "LocustCluster")

17
internal/controller/locustcluster_controller.go
View File

@@ -18,6 +18,7 @@ package controller
import ( import (
"context" "context"
"github.com/go-logr/logr"
locustiov1alpha1 "git.lilpenguins.com/crichardson/locust-operator/api/v1alpha1" locustiov1alpha1 "git.lilpenguins.com/crichardson/locust-operator/api/v1alpha1"
apps "k8s.io/api/apps/v1" apps "k8s.io/api/apps/v1"
@@ -28,13 +29,13 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/event"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/predicate"
) )
// LocustClusterReconciler reconciles a LocustCluster object // LocustClusterReconciler reconciles a LocustCluster object
type LocustClusterReconciler struct { type LocustClusterReconciler struct {
client.Client client.Client
Log logr.Logger
Scheme *runtime.Scheme Scheme *runtime.Scheme
} }
@@ -52,9 +53,8 @@ type LocustClusterReconciler struct {
// For more details, check Reconcile and its Result here: // For more details, check Reconcile and its Result here:
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.20.4/pkg/reconcile // - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.20.4/pkg/reconcile
func (r *LocustClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { func (r *LocustClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
log := logf.FromContext(ctx).WithValues()
log.Info("Looking up LocustCluster") r.Log.Info("Looking up LocustCluster")
// logf.Log.Info("Looking up LocustCluster", "LocustClusterName", req.Name, // logf.Log.Info("Looking up LocustCluster", "LocustClusterName", req.Name,
// "Namespace", req.Namespace) // "Namespace", req.Namespace)
@@ -62,12 +62,12 @@ func (r *LocustClusterReconciler) Reconcile(ctx context.Context, req ctrl.Reques
_, err := GetLocustCluster(r.Client, ctx, req.Namespace, req.Name) _, err := GetLocustCluster(r.Client, ctx, req.Namespace, req.Name)
if err != nil { if err != nil {
if apierrors.IsNotFound(err) { if apierrors.IsNotFound(err) {
log.Info("LocustCluster not found") r.Log.Info("LocustCluster not found")
// logf.Log.Info("LocustCluster not found", "LocustClusterName", req.Name, // logf.Log.Info("LocustCluster not found", "LocustClusterName", req.Name,
// "Namespace", req.Namespace) // "Namespace", req.Namespace)
return ctrl.Result{}, nil return ctrl.Result{}, nil
} }
log.Error(err, "LocustCluster not found") r.Log.Error(err, "LocustCluster not found")
// logf.Log.Error(err, "Failed to lookup LocustCluster", "LocustClusterName", req.Name, // logf.Log.Error(err, "Failed to lookup LocustCluster", "LocustClusterName", req.Name,
// "Namespace", req.Namespace) // "Namespace", req.Namespace)
return ctrl.Result{Requeue: true}, err return ctrl.Result{Requeue: true}, err
@@ -95,19 +95,18 @@ func (r *LocustClusterReconciler) SetupWithManager(mgr ctrl.Manager, ctx context
Complete(r) Complete(r)
*/ */
log := logf.FromContext(ctx).WithValues()
ns := "default" ns := "default"
predLocustCluster := predicate.Funcs{ predLocustCluster := predicate.Funcs{
UpdateFunc: func(e event.UpdateEvent) bool { UpdateFunc: func(e event.UpdateEvent) bool {
log.Info("UpdateFunc", "kind", "LocustCluster", "process event", true, "event.namespace", e.ObjectNew.GetNamespace(), "event.name", e.ObjectNew.GetName(), "currentNamespace", ns) r.Log.Info("UpdateFunc", "kind", "LocustCluster", "process event", true, "event.namespace", e.ObjectNew.GetNamespace(), "event.name", e.ObjectNew.GetName(), "currentNamespace", ns)
return true return true
}, },
CreateFunc: func(e event.CreateEvent) bool { CreateFunc: func(e event.CreateEvent) bool {
log.Info("CreateFunc", "kind", "LocustCluster", "process event", true, "event.namespace", e.Object.GetNamespace(), "event.name", e.Object.GetName(), "currentNamespace", ns) r.Log.Info("CreateFunc", "kind", "LocustCluster", "process event", true, "event.namespace", e.Object.GetNamespace(), "event.name", e.Object.GetName(), "currentNamespace", ns)
return true return true
}, },
DeleteFunc: func(e event.DeleteEvent) bool { DeleteFunc: func(e event.DeleteEvent) bool {
log.Info("DeleteFunc", "kind", "LocustCluster", "process event", false, "event.namespace", e.Object.GetNamespace(), "event.name", e.Object.GetName(), "currentNamespace", ns) r.Log.Info("DeleteFunc", "kind", "LocustCluster", "process event", false, "event.namespace", e.Object.GetNamespace(), "event.name", e.Object.GetName(), "currentNamespace", ns)
return false return false
}, },
} }