Handles both unstructured and commonObject

Author: somtochiama

pkg/patterns/addon/pkg/loaders/fs.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"strings"
 
 	"k8s.io/apimachinery/pkg/runtime"
@@ -53,16 +54,36 @@ func NewManifestLoader(channel string) (*ManifestLoader, error) {
 func (c *ManifestLoader) ResolveManifest(ctx context.Context, object runtime.Object) (map[string]string, error) {
 	log := log.Log
 
-	addonObject, ok := object.(addonsv1alpha1.CommonObject)
-	if !ok {
-		return nil, fmt.Errorf("object %T was not an addonsv1alpha1.CommonObject", object)
-	}
+	var (
+		channelName string
+		version string
+		componentName string
+	)
 
-	componentName := addonObject.ComponentName()
+	unstruct, ok := object.(*unstructured.Unstructured)
+	if ok {
+		v, _, err  := unstructured.NestedString(unstruct.Object, "spec", "version")
+		if err != nil {
+			return nil, fmt.Errorf("unable to get spec.version: %v", err)
+		}
+		version = v
 
-	spec := addonObject.CommonSpec()
-	version := spec.Version
-	channelName := spec.Channel
+		c, _, err  := unstructured.NestedString(unstruct.Object, "spec", "channel")
+		if err != nil {
+			return nil, fmt.Errorf("unable to get spec.version: %v", err)
+		}
+		channelName = c
+
+		componentName = strings.ToLower(unstruct.GetKind())
+	} else if addonObject, ok := object.(addonsv1alpha1.CommonObject); ok {
+		componentName = addonObject.ComponentName()
+
+		spec := addonObject.CommonSpec()
+		version = spec.Version
+		channelName = spec.Channel
+	} else {
+		return nil, fmt.Errorf("object %T was not an addonsv1alpha1.CommonObject", object)
+	}
 
 	// TODO: We should actually do id (1.1.2-aws or 1.1.1-nginx). But maybe YAGNI
 	id := version

pkg/patterns/addon/pkg/status/aggregate.go

@@ -19,6 +19,7 @@ package status
 import (
 	"context"
 	"fmt"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"reflect"
 
 	appsv1 "k8s.io/api/apps/v1"
@@ -46,50 +47,90 @@ type aggregator struct {
 func (a *aggregator) Reconciled(ctx context.Context, src declarative.DeclarativeObject, objs *manifest.Objects) error {
 	log := log.Log
 
-	instance, ok := src.(addonv1alpha1.CommonObject)
-	if !ok {
+	unstruct, ok := src.(*unstructured.Unstructured)
+	instance, commonOkay := src.(addonv1alpha1.CommonObject)
+
+	unstructStatus := make(map[string]interface{})
+	var status addonv1alpha1.CommonStatus
+
+	statusHealthy := true
+	statusErrors := []string{}
+
+	if ok{
+		unstructStatus["Healthy"] = true
+	} else if commonOkay {
+		status = addonv1alpha1.CommonStatus{Healthy: true}
+	} else {
 		return fmt.Errorf("object %T was not an addonv1alpha1.CommonObject", src)
 	}
 
-	status := addonv1alpha1.CommonStatus{Healthy: true}
-
 	for _, o := range objs.Items {
 		gk := o.Group + "/" + o.Kind
 		healthy := true
 		var err error
 		switch gk {
 		case "/Service":
-			healthy, err = a.service(ctx, instance, o.Name)
+			healthy, err = a.service(ctx, src, o.Name)
 		case "extensions/Deployment", "apps/Deployment":
-			healthy, err = a.deployment(ctx, instance, o.Name)
+			healthy, err = a.deployment(ctx, src, o.Name)
 		default:
 			log.WithValues("type", gk).V(2).Info("type not implemented for status aggregation, skipping")
 		}
 
-		status.Healthy = status.Healthy && healthy
+
+		statusHealthy = statusHealthy && healthy
 		if err != nil {
-			status.Errors = append(status.Errors, fmt.Sprintf("%v", err))
+			statusErrors = append(statusErrors, fmt.Sprintf("%v", err))
 		}
 	}
 
 	log.WithValues("object", src).WithValues("status", status).V(2).Info("built status")
 
-	if !reflect.DeepEqual(status, instance.GetCommonStatus()) {
-		instance.SetCommonStatus(status)
+	if commonOkay {
+		status.Errors = statusErrors
+		status.Healthy = statusHealthy
+
+		if !reflect.DeepEqual(status, instance.GetCommonStatus()) {
+			instance.SetCommonStatus(status)
 
-		log.WithValues("name", instance.GetName()).WithValues("status", status).Info("updating status")
+			log.WithValues("name", instance.GetName()).WithValues("status", status).Info("updating status")
 
-		err := a.client.Update(ctx, instance)
+			err := a.client.Update(ctx, instance)
+			if err != nil {
+				log.Error(err, "updating status")
+				return err
+			}
+		}
+	} else {
+		unstructStatus["Healthy"] = true
+		unstructStatus["Errors"] = statusErrors
+		s, _, err := unstructured.NestedMap(unstruct.Object, "status")
 		if err != nil {
-			log.Error(err, "updating status")
-			return err
+			log.Error(err, "getting status")
+			return fmt.Errorf("unable to get status from unstructured: %v", err)
+		}
+		if !reflect.DeepEqual(status, s) {
+			err = unstructured.SetNestedField(unstruct.Object, statusHealthy, "status", "healthy")
+			err = unstructured.SetNestedStringSlice(unstruct.Object, statusErrors, "status", "errors")
+			if err != nil {
+				log.Error(err, "updating status")
+				return fmt.Errorf("unable to set status in unstructured", err)
+			}
+
+			log.WithValues("name", unstruct.GetName()).WithValues("status", status).Info("updating status")
+
+			err = a.client.Update(ctx, unstruct)
+			if err != nil {
+				log.Error(err, "updating status")
+				return err
+			}
 		}
 	}
 
 	return nil
 }
 
-func (a *aggregator) deployment(ctx context.Context, src addonv1alpha1.CommonObject, name string) (bool, error) {
+func (a *aggregator) deployment(ctx context.Context, src declarative.DeclarativeObject, name string) (bool, error) {
 	key := client.ObjectKey{Namespace: src.GetNamespace(), Name: name}
 	dep := &appsv1.Deployment{}
 
@@ -106,7 +147,7 @@ func (a *aggregator) deployment(ctx context.Context, src addonv1alpha1.CommonObj
 	return false, fmt.Errorf("deployment (%s) does not meet condition: %s", key, successfulDeployment)
 }
 
-func (a *aggregator) service(ctx context.Context, src addonv1alpha1.CommonObject, name string) (bool, error) {
+func (a *aggregator) service(ctx context.Context, src declarative.DeclarativeObject, name string) (bool, error) {
 	key := client.ObjectKey{Namespace: src.GetNamespace(), Name: name}
 	svc := &corev1.Service{}
 	err := a.client.Get(ctx, key, svc)

pkg/patterns/declarative/reconciler.go

@@ -21,6 +21,8 @@ import (
 	"errors"
 	"fmt"
 	"path/filepath"
+	"sigs.k8s.io/cli-utils/pkg/kstatus/status"
+	addonsv1alpha1 "sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/addon/pkg/apis/v1alpha1"
 	"strings"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"