Emit Events for ClusterTriggerAuthentication (#1647)

* Emit Events for ClusterTriggerAuthentication

Signed-off-by: Zbynek Roubalik <zroubali@redhat.com>

* update changelog

Signed-off-by: Zbynek Roubalik <zroubali@redhat.com>

Co-authored-by: Ahmed ElSayed <ahmels@microsoft.com>

.golangci.yml

@@ -60,6 +60,11 @@ issues:
     - path: _finalizer.go
       linters:
         - interfacer
+  # Exclude for clustertriggerauthentication_controller and triggerauthentication_controller, reason:
+  # controllers/clustertriggerauthentication_controller.go:1: 1-59 lines are duplicate of `controllers/triggerauthentication_controller.go:1-58` (dupl)
+    - path: triggerauthentication_controller.go
+      linters:
+        - dupl
   # Got "sigs.k8s.io/controller-runtime/pkg/client/fake is deprecated: please use pkg/envtest for testing"
   # This might not be ideal, see: https://github.com/kubernetes-sigs/controller-runtime/issues/768
     - path: scale_resolvers_test.go

CHANGELOG.md

@@ -20,6 +20,7 @@
 ### New
 
 - TODO ([#XXX](https://github.com/kedacore/keda/issues/XXX))
+- Emit Kubernetes Events on KEDA events ([#1523](https://github.com/kedacore/keda/pull/1523) | [#1647](https://github.com/kedacore/keda/pull/1647))
 - Support Quantities in metrics API scaler ([#1667](https://github.com/kedacore/keda/issues/1667))
 - Emit Kubernetes Events on KEDA events ([#1523](https://github.com/kedacore/keda/pull/1523))
 - Add Microsoft SQL Server (MSSQL) scaler ([#674](https://github.com/kedacore/keda/issues/674) | [docs](https://keda.sh/docs/2.2/scalers/mssql/))

config/rbac/role.yaml

@@ -57,6 +57,13 @@ rules:
   - jobs
   verbs:
   - '*'
+- apiGroups:
+  - keda.sh
+  resources:
+  - clustertriggerauthentications
+  - clustertriggerauthentications/status
+  verbs:
+  - '*'
 - apiGroups:
   - keda.sh
   resources:
@@ -76,8 +83,6 @@ rules:
 - apiGroups:
   - keda.sh
   resources:
-  - clustertriggerauthentications
-  - clustertriggerauthentications/status
   - triggerauthentications
   - triggerauthentications/status
   verbs:

controllers/clustertriggerauthentication_controller.go

@@ -0,0 +1,59 @@
+package controllers
+
+import (
+	"context"
+
+	"github.com/go-logr/logr"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/client-go/tools/record"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/builder"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
+
+	kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1"
+	"github.com/kedacore/keda/v2/pkg/eventreason"
+)
+
+// +kubebuilder:rbac:groups=keda.sh,resources=clustertriggerauthentications;clustertriggerauthentications/status,verbs="*"
+
+// ClusterTriggerAuthenticationReconciler reconciles a ClusterTriggerAuthentication object
+type ClusterTriggerAuthenticationReconciler struct {
+	Client   client.Client
+	Log      logr.Logger
+	Recorder record.EventRecorder
+}
+
+// Reconcile performs reconciliation on the identified TriggerAuthentication resource based on the request information passed, returns the result and an error (if any).
+func (r *ClusterTriggerAuthenticationReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
+	reqLogger := r.Log.WithValues("ClusterTriggerAuthentication.Namespace", req.Namespace, "ClusterTriggerAuthentication.Name", req.Name)
+
+	clusterTriggerAuthentication := &kedav1alpha1.ClusterTriggerAuthentication{}
+	err := r.Client.Get(context.TODO(), req.NamespacedName, clusterTriggerAuthentication)
+	if err != nil {
+		if errors.IsNotFound(err) {
+			return ctrl.Result{}, nil
+		}
+		reqLogger.Error(err, "Failed ot get ClusterTriggerAuthentication")
+		return ctrl.Result{}, err
+	}
+
+	if clusterTriggerAuthentication.GetDeletionTimestamp() != nil {
+		r.Recorder.Event(clusterTriggerAuthentication, corev1.EventTypeNormal, eventreason.ClusterTriggerAuthenticationDeleted, "ClusterTriggerAuthentication was deleted")
+		return ctrl.Result{}, nil
+	}
+
+	if clusterTriggerAuthentication.ObjectMeta.Generation == 1 {
+		r.Recorder.Event(clusterTriggerAuthentication, corev1.EventTypeNormal, eventreason.ClusterTriggerAuthenticationAdded, "New ClusterTriggerAuthentication configured")
+	}
+
+	return ctrl.Result{}, nil
+}
+
+// SetupWithManager initializes the ClusterTriggerAuthenticationReconciler instance and starts a new controller managed by the passed Manager instance.
+func (r *ClusterTriggerAuthenticationReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	return ctrl.NewControllerManagedBy(mgr).
+		For(&kedav1alpha1.ClusterTriggerAuthentication{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
+		Complete(r)
+}

controllers/scaledjob_controller.go

@@ -25,7 +25,6 @@ import (
 )
 
 // +kubebuilder:rbac:groups=keda.sh,resources=scaledjobs;scaledjobs/finalizers;scaledjobs/status,verbs="*"
-// +kubebuilder:rbac:groups=keda.sh,resources=triggerauthentications;triggerauthentications/status,verbs="*"
 // +kubebuilder:rbac:groups=batch,resources=jobs,verbs="*"
 
 // ScaledJobReconciler reconciles a ScaledJob object

controllers/scaledobject_controller.go

@@ -36,7 +36,6 @@ import (
 )
 
 // +kubebuilder:rbac:groups=keda.sh,resources=scaledobjects;scaledobjects/finalizers;scaledobjects/status,verbs="*"
-// +kubebuilder:rbac:groups=keda.sh,resources=triggerauthentications;triggerauthentications/status,verbs="*"
 // +kubebuilder:rbac:groups=autoscaling,resources=horizontalpodautoscalers,verbs="*"
 // +kubebuilder:rbac:groups="",resources=configmaps;configmaps/status;events,verbs="*"
 // +kubebuilder:rbac:groups="",resources=pods;services;services;secrets;external,verbs=get;list;watch

main.go

@@ -153,6 +153,14 @@ func main() {
 		setupLog.Error(err, "unable to create controller", "controller", "TriggerAuthentication")
 		os.Exit(1)
 	}
+	if err = (&controllers.ClusterTriggerAuthenticationReconciler{
+		Client:   mgr.GetClient(),
+		Log:      ctrl.Log.WithName("controllers").WithName("ClusterTriggerAuthentication"),
+		Recorder: eventRecorder,
+	}).SetupWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create controller", "controller", "ClusterTriggerAuthentication")
+		os.Exit(1)
+	}
 	// +kubebuilder:scaffold:builder
 
 	setupLog.Info("Starting manager")

pkg/eventreason/eventreason.go

@@ -64,4 +64,10 @@ const (
 
 	// TriggerAuthenticationAdded is for event when a TriggerAuthentication is added
 	TriggerAuthenticationAdded = "TriggerAuthenticationAdded"
+
+	// ClusterTriggerAuthenticationDeleted is for event when a ClusterTriggerAuthentication is deleted
+	ClusterTriggerAuthenticationDeleted = "ClusterTriggerAuthenticationDeleted"
+
+	// ClusterTriggerAuthenticationAdded is for event when a ClusterTriggerAuthentication is added
+	ClusterTriggerAuthenticationAdded = "ClusterTriggerAuthenticationAdded"
 )