Merge pull request #51 from crobby/110picksbranch

picking changes to v1.0.0 branch for v1.0.10

CHANGELOG.md

@@ -11,3 +11,22 @@
 ## Release 1.0.1 (2021-02-18T20:31:05)
 ### Features
 * Update .thoth.yaml
+### Bug Fix
+* Rebase the version string with latest release (#104)
+
+## Release 1.0.6 (2021-03-25T17:17:12)
+### Bug Fix
+* Bump version to v1.0.5 for kebechet bot (#109)
+
+## Release 1.0.9 (2021-04-15T16:14:40)
+### Improvements
+* Fix imagestream watch (#118)
+* Update resource watches (#116)
+### Features
+* Implement clean uninstall of operator (#117)
+
+## Release 1.0.10 (2021-04-22T13:13:22)
+### Improvements
+* Update ODH operator to reconcile updated objects (#119)
+### Features
+* Implement initial KfDef status (#113)

pkg/controller/kfdef/kfdef_controller.go

@@ -239,8 +239,17 @@ var ownedResourcePredicates = predicate.Funcs{
 		return true
 	},
 	UpdateFunc: func(e event.UpdateEvent) bool {
-		// no action
-		return false
+		// handle update events
+		object, err := meta.Accessor(e.ObjectOld)
+		if err != nil {
+			return false
+		}
+		log.Infof("Got update event for %v.%v.", object.GetName(), object.GetNamespace())
+		// if this object has an owner, let the owner handle the appropriate recovery
+		if len(object.GetOwnerReferences()) > 0 {
+			return false
+		}
+		return true
 	},
 }
 
@@ -361,7 +370,7 @@ func (r *ReconcileKfDef) Reconcile(request reconcile.Request) (reconcile.Result,
 		}
 	}
 
-	err = kfApply(instance)
+	err = getReconcileStatus(instance, kfApply(instance))
 	if err == nil {
 		log.Infof("KubeFlow Deployment Completed.")
 
@@ -370,7 +379,7 @@ func (r *ReconcileKfDef) Reconcile(request reconcile.Request) (reconcile.Result,
 			kfdefInstances[strings.Join([]string{instance.GetName(), instance.GetNamespace()}, ".")] = struct{}{}
 		}
 
-		if b2ndController == false {
+		if !b2ndController {
 			c, err := controller.New("kubeflow-controller", kfdefManager, controller.Options{Reconciler: r})
 			if err != nil {
 				return reconcile.Result{}, nil
@@ -400,6 +409,11 @@ func (r *ReconcileKfDef) Reconcile(request reconcile.Request) (reconcile.Result,
 		return reconcile.Result{Requeue: true}, nil
 	}
 
+	// set status of the KfDef resource
+	if err := r.reconcileStatus(instance); err != nil {
+		return reconcile.Result{}, err
+	}
+
 	// If deployment created successfully - don't requeue
 	return reconcile.Result{}, err
 }

pkg/controller/kfdef/status.go

@@ -0,0 +1,62 @@
+package kfdef
+
+import (
+	"context"
+	"reflect"
+
+	kfdefv1 "github.com/kubeflow/kfctl/v3/pkg/apis/apps/kfdef/v1"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/types"
+)
+
+const DeploymentCompleted string = "Kubeflow Deployment completed"
+
+// The setKfDefStatus method accepts a custom resource of type KfDef type
+// It retrieves the current stored version of the resource and compares the
+// status subresource. If different, the status is updated
+func (r *ReconcileKfDef) setKfDefStatus(cr *kfdefv1.KfDef) error {
+	ctx := context.Background()
+	objKey := types.NamespacedName{
+		Namespace: cr.Namespace,
+		Name:      cr.Name,
+	}
+	current := &kfdefv1.KfDef{}
+	if err := r.client.Get(ctx, objKey, current); err != nil {
+		return err
+	}
+
+	if !reflect.DeepEqual(cr.Status, current.Status) {
+		current.Status = cr.Status
+		return r.client.Status().Update(ctx, current)
+	}
+
+	return nil
+}
+
+func (r *ReconcileKfDef) reconcileStatus(cr *kfdefv1.KfDef) error {
+	return r.setKfDefStatus(cr)
+}
+
+func getReconcileStatus(cr *kfdefv1.KfDef, err error) error {
+	conditions := []kfdefv1.KfDefCondition{}
+
+	if err != nil {
+		conditions = append(conditions, kfdefv1.KfDefCondition{
+			LastUpdateTime: cr.CreationTimestamp,
+			Status:         corev1.ConditionTrue,
+			Reason:         err.Error(),
+			Type:           kfdefv1.KfDegraded,
+		})
+	}
+
+	conditions = append(conditions, kfdefv1.KfDefCondition{
+		LastUpdateTime: cr.CreationTimestamp,
+		Status:         corev1.ConditionTrue,
+		Reason:         DeploymentCompleted,
+		Type:           kfdefv1.KfAvailable,
+	})
+
+	cr.Status.Conditions = conditions
+
+	return err
+}

version.py

@@ -2,4 +2,4 @@
 """opendatahub operator."""
 
 
-__version__ = "1.0.1"
+__version__ = "1.0.10"