comment out

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/
 

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)
-}

config/samples/deploy.yaml

@@ -1,4 +1,5 @@
 apiVersion: apps/v1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: locust-operator

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)
 }