From 69f2af254986ed4f52ecc430367483bdd527119c Mon Sep 17 00:00:00 2001 From: Chris Richardson Date: Thu, 3 Jul 2025 13:05:45 -0400 Subject: [PATCH] comment out --- Dockerfile | 2 +- cmd/main.go | 39 ------------------- config/samples/deploy.yaml | 1 + .../controller/locustcluster_controller.go | 37 ++++++++++++++++-- 4 files changed, 36 insertions(+), 43 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5a9c6d8..dee8954 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ COPY go.sum go.sum RUN go mod download # Copy the go source -COPY cmd/main.go cmd/main.go +COPY cmd/ cmd/ COPY api/ api/ COPY internal/ internal/ diff --git a/cmd/main.go b/cmd/main.go index b3d5ae0..356534e 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -19,17 +19,12 @@ package main import ( "crypto/tls" "flag" - "log" "os" "path/filepath" locustiov1alpha1 "git.lilpenguins.com/crichardson/locust-operator/api/v1alpha1" "git.lilpenguins.com/crichardson/locust-operator/internal/controller" - "github.com/go-logr/logr" - "github.com/go-logr/zapr" "go.uber.org/zap" - "go.uber.org/zap/zapcore" - "gopkg.in/natefinch/lumberjack.v2" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" @@ -250,37 +245,3 @@ func main() { os.Exit(1) } } - -func CreateFileLogger(fileName string, logLevel zapcore.LevelEnabler) logr.Logger { - - // Create file with desired permissions - file, err := os.OpenFile(fileName, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) - if err != nil { - log.Fatal(err) - } - defer func() { - if cerr := file.Close(); cerr != nil && err == nil { - err = cerr - } - }() - - config := zap.NewProductionEncoderConfig() - config.EncodeTime = zapcore.ISO8601TimeEncoder - fileEncoder := zapcore.NewJSONEncoder(config) - consoleEncoder := zapcore.NewConsoleEncoder(config) - writer := zapcore.AddSync(&lumberjack.Logger{ - Filename: fileName, - MaxSize: 1000, // MB - MaxBackups: 3, - MaxAge: 90, // days - Compress: false, - }) - - core := zapcore.NewTee( - zapcore.NewCore(fileEncoder, writer, logLevel), - zapcore.NewCore(consoleEncoder, zapcore.AddSync(os.Stdout), logLevel), - ) - - logger := zap.New(core, zap.AddCaller(), zap.AddStacktrace(zapcore.ErrorLevel)) - return zapr.NewLogger(logger) -} diff --git a/config/samples/deploy.yaml b/config/samples/deploy.yaml index 853fab6..6b1d229 100644 --- a/config/samples/deploy.yaml +++ b/config/samples/deploy.yaml @@ -1,4 +1,5 @@ apiVersion: apps/v1 +apiVersion: apps/v1 kind: Deployment metadata: name: locust-operator diff --git a/internal/controller/locustcluster_controller.go b/internal/controller/locustcluster_controller.go index eb48791..be56a7c 100644 --- a/internal/controller/locustcluster_controller.go +++ b/internal/controller/locustcluster_controller.go @@ -18,12 +18,16 @@ package controller import ( "context" - + apps "k8s.io/api/apps/v1" + batch "k8s.io/api/batch/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/controller" + "sigs.k8s.io/controller-runtime/pkg/event" logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/predicate" locustiov1alpha1 "git.lilpenguins.com/crichardson/locust-operator/api/v1alpha1" ) @@ -83,9 +87,36 @@ func (r *LocustClusterReconciler) Reconcile(ctx context.Context, req ctrl.Reques } // SetupWithManager sets up the controller with the Manager. -func (r *LocustClusterReconciler) SetupWithManager(mgr ctrl.Manager) error { +func (r *LocustClusterReconciler) SetupWithManager(mgr ctrl.Manager, ctx context.Context) error { + /* + return ctrl.NewControllerManagedBy(mgr). + For(&locustiov1alpha1.LocustCluster{}). + Named("locustcluster"). + Complete(r) + */ + + log := logf.FromContext(ctx).WithValues() + ns := "default" + predLocustCluster := predicate.Funcs{ + 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) + return true + }, + 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) + return true + }, + 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) + return false + }, + } + return ctrl.NewControllerManagedBy(mgr). For(&locustiov1alpha1.LocustCluster{}). - Named("locustcluster"). + Owns(&batch.Job{}). + Owns(&apps.Deployment{}). + WithEventFilter(predLocustCluster). + WithOptions(controller.Options{MaxConcurrentReconciles: MaxConcurrentReconciles}). Complete(r) }