Merge pull request #11 from surajkota/adopt_extra_check

adopt only if APIGroup match

Author: jaypipes

pkg/runtime/adoption_reconciler.go

@@ -30,6 +30,7 @@ import (
 	ackmetrics "github.com/aws-controllers-k8s/runtime/pkg/metrics"
 	"github.com/aws-controllers-k8s/runtime/pkg/requeue"
 	ackrtcache "github.com/aws-controllers-k8s/runtime/pkg/runtime/cache"
+	ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log"
 	acktypes "github.com/aws-controllers-k8s/runtime/pkg/types"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -85,6 +86,18 @@ func (r *adoptionReconciler) reconcile(req ctrlrt.Request) error {
 	}
 
 	gk := r.getTargetResourceGroupKind(res)
+
+	// Check if the target API group matches with the controller
+	var controllerRMF acktypes.AWSResourceManagerFactory
+	for _, v := range r.sc.GetResourceManagerFactories() {
+		controllerRMF = v
+		break
+	}
+	if gk.Group != controllerRMF.ResourceDescriptor().GroupKind().Group {
+		ackrtlog.DebugAdoptedResource(r.log, res, "target resource API group is not of this service. no-op")
+		return nil
+	}
+
 	// Look up the rmf for the given target resource GVK
 	rmf, ok := (r.sc.GetResourceManagerFactories())[gk.String()]
 	if !ok {
@@ -111,8 +124,7 @@ func (r *adoptionReconciler) reconcile(req ctrlrt.Request) error {
 		return err
 	}
 
-	// TODO(RedbackThomson): Better logging for adopted resources
-	r.log.Info("starting adoption reconciliation")
+	ackrtlog.InfoAdoptedResource(r.log, res, "starting adoption reconciliation")
 
 	rm, err := rmf.ManagerFor(
 		r.cfg, r.log, r.metrics, r, sess, acctID, region,
@@ -460,7 +472,7 @@ func NewAdoptionReconciler(
 	return &adoptionReconciler{
 		reconciler: reconciler{
 			sc:      sc,
-			log:     log.WithName("ackrt"),
+			log:     log.WithName("adopted-reconciler"),
 			cfg:     cfg,
 			metrics: metrics,
 		},

pkg/runtime/log/resource.go

@@ -16,6 +16,7 @@ package log
 import (
 	"github.com/go-logr/logr"
 
+	"github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1"
 	acktypes "github.com/aws-controllers-k8s/runtime/pkg/types"
 )
 
@@ -67,3 +68,50 @@ func InfoResource(
 ) {
 	AdaptResource(log, res, additionalValues...).V(0).Info(msg)
 }
+
+// AdaptAdoptedResource returns a logger with log values set for the adopted
+// resource's kind, namespace, name, etc
+func AdaptAdoptedResource(
+	log logr.Logger,
+	res *v1alpha1.AdoptedResource,
+	additionalValues ...interface{},
+) logr.Logger {
+	ns := res.Namespace
+	resName := res.Name
+	generation := res.Generation
+	group := res.Spec.Kubernetes.Group
+	kind := res.Spec.Kubernetes.Kind
+	vals := []interface{}{
+		"target_group", group,
+		"target_kind", kind,
+		"namespace", ns,
+		"name", resName,
+		"generation", generation,
+	}
+	if len(additionalValues) > 0 {
+		vals = append(vals, additionalValues...)
+	}
+	return log.WithValues(vals...)
+}
+
+// DebugAdoptedResource writes a supplied log message about a adopted resource that
+// includes a set of standard log values for the resource's kind, namespace, name, etc
+func DebugAdoptedResource(
+	log logr.Logger,
+	res *v1alpha1.AdoptedResource,
+	msg string,
+	additionalValues ...interface{},
+) {
+	AdaptAdoptedResource(log, res, additionalValues...).V(1).Info(msg)
+}
+
+// InfoAdoptedResource writes a supplied log message about a adopted resource that
+// includes a set of standard log values for the resource's kind, namespace, name, etc
+func InfoAdoptedResource(
+	log logr.Logger,
+	res *v1alpha1.AdoptedResource,
+	msg string,
+	additionalValues ...interface{},
+) {
+	AdaptAdoptedResource(log, res, additionalValues...).V(0).Info(msg)
+}