🐛 Revert alpha2 crd

api/addon.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	crd "github.com/konveyor/tackle2-hub/k8s/api/tackle/v1alpha2"
+	crd "github.com/konveyor/tackle2-hub/k8s/api/tackle/v1alpha1"
 	core "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	k8s "sigs.k8s.io/controller-runtime/pkg/client"

api/base.go

@@ -14,10 +14,10 @@ import (
 	"github.com/gin-gonic/gin/binding"
 	liberr "github.com/jortel/go-utils/error"
 	"github.com/jortel/go-utils/logr"
-	"github.com/konveyor/tackle2-hub/api/reflect"
 	"github.com/konveyor/tackle2-hub/api/sort"
 	"github.com/konveyor/tackle2-hub/auth"
 	"github.com/konveyor/tackle2-hub/model"
+	"github.com/konveyor/tackle2-hub/reflect"
 	"gopkg.in/yaml.v2"
 	"gorm.io/gorm"
 	"sigs.k8s.io/controller-runtime/pkg/client"

api/sort/sort.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
-	"github.com/konveyor/tackle2-hub/api/reflect"
+	"github.com/konveyor/tackle2-hub/reflect"
 	"gorm.io/gorm"
 )
 

api/taskgroup.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	crd "github.com/konveyor/tackle2-hub/k8s/api/tackle/v1alpha2"
+	crd "github.com/konveyor/tackle2-hub/k8s/api/tackle/v1alpha1"
 	"github.com/konveyor/tackle2-hub/model"
 	tasking "github.com/konveyor/tackle2-hub/task"
 	"gorm.io/gorm/clause"

controller/addon.go

@@ -2,13 +2,15 @@ package controller
 
 import (
 	"context"
+	"strings"
 
 	"github.com/go-logr/logr"
 	logr2 "github.com/jortel/go-utils/logr"
-	api "github.com/konveyor/tackle2-hub/k8s/api/tackle/v1alpha2"
+	api "github.com/konveyor/tackle2-hub/k8s/api/tackle/v1alpha1"
 	"github.com/konveyor/tackle2-hub/settings"
 	"gorm.io/gorm"
 	k8serr "k8s.io/apimachinery/pkg/api/errors"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apiserver/pkg/storage/names"
 	"k8s.io/client-go/tools/record"
 	k8s "sigs.k8s.io/controller-runtime/pkg/client"
@@ -32,9 +34,10 @@ var Settings = &settings.Settings
 // Add the controller.
 func Add(mgr manager.Manager, db *gorm.DB) error {
 	reconciler := &Reconciler{
-		Client: mgr.GetClient(),
-		Log:    log,
-		DB:     db,
+		history: make(map[string]byte),
+		Client:  mgr.GetClient(),
+		Log:     log,
+		DB:      db,
 	}
 	cnt, err := controller.New(
 		Name,
@@ -59,15 +62,18 @@ func Add(mgr manager.Manager, db *gorm.DB) error {
 }
 
 // Reconciler reconciles addon CRs.
+// The history is used to ensure resources are reconciled
+// at least once at startup.
 type Reconciler struct {
 	record.EventRecorder
 	k8s.Client
-	DB  *gorm.DB
-	Log logr.Logger
+	DB      *gorm.DB
+	Log     logr.Logger
+	history map[string]byte
 }
 
 // Reconcile a Addon CR.
-// Note: Must not a pointer receiver to ensure that the
+// Note: Must not be a pointer receiver to ensure that the
 // logger and other state is not shared.
 func (r Reconciler) Reconcile(ctx context.Context, request reconcile.Request) (result reconcile.Result, err error) {
 	r.Log = logr2.WithName(
@@ -86,18 +92,23 @@ func (r Reconciler) Reconcile(ctx context.Context, request reconcile.Request) (r
 		}
 		return
 	}
-	// migrate
-	migrated, err := r.alpha2Migration(addon)
-	if migrated || err != nil {
+	_, found := r.history[addon.Name]
+	if found && addon.Reconciled() {
 		return
 	}
-	// changed.
-	err = r.addonChanged(addon)
-	if err != nil {
+	r.history[addon.Name] = 1
+	addon.Status.Conditions = nil
+	addon.Status.ObservedGeneration = addon.Generation
+	// Changed
+	migrated, err := r.addonChanged(addon)
+	if migrated || err != nil {
 		return
 	}
+	// Ready condition.
+	addon.Status.Conditions = append(
+		addon.Status.Conditions,
+		r.ready(addon))
 	// Apply changes.
-	addon.Status.ObservedGeneration = addon.Generation
 	err = r.Status().Update(context.TODO(), addon)
 	if err != nil {
 		return
@@ -106,47 +117,50 @@ func (r Reconciler) Reconcile(ctx context.Context, request reconcile.Request) (r
 	return
 }
 
-// addonChanged an addon has been created/updated.
-func (r *Reconciler) addonChanged(addon *api.Addon) (err error) {
-	return
-}
-
-// addonDeleted an addon has been deleted.
-func (r *Reconciler) addonDeleted(name string) (err error) {
-	return
-}
-
-// alpha2Migration migrates to alpha2.
-func (r *Reconciler) alpha2Migration(addon *api.Addon) (migrated bool, err error) {
-	if addon.Spec.Image != nil {
-		if addon.Spec.Container.Image == "" {
-			addon.Spec.Container.Image = *addon.Spec.Image
+// ready returns the ready condition.
+func (r *Reconciler) ready(addon *api.Addon) (ready v1.Condition) {
+	ready = api.Ready
+	ready.LastTransitionTime = v1.Now()
+	ready.ObservedGeneration = addon.Status.ObservedGeneration
+	err := make([]string, 0)
+	for i := range addon.Status.Conditions {
+		cnd := &addon.Status.Conditions[i]
+		if cnd.Type == api.ValidationError {
+			err = append(err, cnd.Message)
 		}
-		addon.Spec.Image = nil
-		migrated = true
 	}
-	if addon.Spec.Resources != nil {
-		if len(addon.Spec.Container.Resources.Limits) == 0 {
-			addon.Spec.Container.Resources.Limits = (*addon.Spec.Resources).Limits
-		}
-		if len(addon.Spec.Container.Resources.Requests) == 0 {
-			addon.Spec.Container.Resources.Requests = (*addon.Spec.Resources).Requests
-		}
-		addon.Spec.Resources = nil
-		migrated = true
-	}
-	if addon.Spec.ImagePullPolicy != nil {
-		if addon.Spec.Container.ImagePullPolicy == "" {
-			addon.Spec.Container.ImagePullPolicy = *addon.Spec.ImagePullPolicy
-		}
-		addon.Spec.ImagePullPolicy = nil
-		migrated = true
+	if len(err) == 0 {
+		ready.Status = v1.ConditionTrue
+		ready.Reason = api.Validated
+		ready.Message = strings.Join(err, ";")
+	} else {
+		ready.Status = v1.ConditionFalse
+		ready.Reason = api.ValidationError
 	}
+	return
+}
+
+// addonChanged an addon has been created/updated.
+func (r *Reconciler) addonChanged(addon *api.Addon) (migrated bool, err error) {
+	migrated = addon.Migrate()
 	if migrated {
 		err = r.Update(context.TODO(), addon)
 		if err != nil {
 			return
 		}
 	}
+	if addon.Spec.Container.Image == "" {
+		cnd := api.ImageNotDefined
+		cnd.LastTransitionTime = v1.Now()
+		cnd.ObservedGeneration = addon.Status.ObservedGeneration
+		addon.Status.Conditions = append(
+			addon.Status.Conditions,
+			cnd)
+	}
+	return
+}
+
+// addonDeleted an addon has been deleted.
+func (r *Reconciler) addonDeleted(name string) (err error) {
 	return
 }