issue events during ARS reconciling

On-behalf-of: @SAP christoph.mewes@sap.com

Author: xrstf

internal/controller/apiexport/controller.go

@@ -103,6 +103,7 @@ func Add(
 		// Watch for changes to PublishedResources on the local service cluster
 		Watches(&syncagentv1alpha1.PublishedResource{}, controllerutil.EnqueueConst[ctrlruntimeclient.Object]("dummy"), builder.WithPredicates(predicateutil.ByLabels(prFilter), hasARS)).
 		Build(reconciler)
+
 	return err
 }
 
@@ -166,7 +167,7 @@ func (r *Reconciler) reconcile(ctx context.Context) error {
 
 	// reconcile an APIExport in kcp
 	factories := []reconciling.NamedAPIExportReconcilerFactory{
-		r.createAPIExportReconciler(arsList, claimedResources, r.agentName, r.apiExportName),
+		r.createAPIExportReconciler(arsList, claimedResources, r.agentName, r.apiExportName, r.recorder),
 	}
 
 	if err := reconciling.ReconcileAPIExports(ctx, factories, "", r.kcpClient); err != nil {

internal/controller/apiexport/reconciler.go

@@ -25,13 +25,22 @@ import (
 
 	kcpdevv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
 
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/client-go/tools/record"
 )
 
 // createAPIExportReconciler creates the reconciler for the APIExport.
 // WARNING: The APIExport in this is NOT created by the Sync Agent, it's created
 // by a controller in kcp. Make sure you don't create a reconciling conflict!
-func (r *Reconciler) createAPIExportReconciler(availableResourceSchemas sets.Set[string], claimedResourceKinds sets.Set[string], agentName string, apiExportName string) reconciling.NamedAPIExportReconcilerFactory {
+func (r *Reconciler) createAPIExportReconciler(
+	availableResourceSchemas sets.Set[string],
+	claimedResourceKinds sets.Set[string],
+	agentName string,
+	apiExportName string,
+	recorder record.EventRecorder,
+) reconciling.NamedAPIExportReconcilerFactory {
 	return func() (string, reconciling.APIExportReconciler) {
 		return apiExportName, func(existing *kcpdevv1alpha1.APIExport) (*kcpdevv1alpha1.APIExport, error) {
 			if existing.Annotations == nil {
@@ -40,7 +49,10 @@ func (r *Reconciler) createAPIExportReconciler(availableResourceSchemas sets.Set
 			existing.Annotations[syncagentv1alpha1.AgentNameAnnotation] = agentName
 
 			// combine existing schemas with new ones
-			existing.Spec.LatestResourceSchemas = mergeResourceSchemas(existing.Spec.LatestResourceSchemas, availableResourceSchemas)
+			newSchemas := mergeResourceSchemas(existing.Spec.LatestResourceSchemas, availableResourceSchemas)
+			createSchemaEvents(existing, existing.Spec.LatestResourceSchemas, newSchemas, recorder)
+
+			existing.Spec.LatestResourceSchemas = newSchemas
 
 			// To allow admins to configure additional permission claims, sometimes
 			// useful for debugging, we do not override the permission claims, but
@@ -65,6 +77,8 @@ func (r *Reconciler) createAPIExportReconciler(availableResourceSchemas sets.Set
 					},
 					All: true,
 				})
+
+				recorder.Eventf(existing, corev1.EventTypeNormal, "AddingPermissionClaim", "Added new permission claim for all %s.", claimed)
 			}
 
 			// prevent reconcile loops by ensuring a stable order
@@ -113,6 +127,19 @@ func mergeResourceSchemas(existing []string, configured sets.Set[string]) []stri
 	return result
 }
 
+func createSchemaEvents(obj runtime.Object, oldSchemas, newSchemas []string, recorder record.EventRecorder) {
+	oldSet := sets.New(oldSchemas...)
+	newSet := sets.New(newSchemas...)
+
+	for _, s := range newSet.Difference(oldSet) {
+		recorder.Eventf(obj, corev1.EventTypeNormal, "AddingResourceSchema", "Added new resource schema %s.", s)
+	}
+
+	for _, s := range oldSet.Difference(newSet) {
+		recorder.Eventf(obj, corev1.EventTypeWarning, "RemovingResourceSchema", "Removed resource schema %s.", s)
+	}
+}
+
 func parseResourceGroup(schema string) string {
 	// <version>.<resource>.<group>
 	parts := strings.SplitN(schema, ".", 2)