Add Cinder CR condition

When cinder is used as a backen, we might want to have a Condition that
is set to False and is visible in the cli. However, when either Cinder
is ready or it's not used as a backend, we can mark it as true.

Signed-off-by: Francesco Pantano <[email protected]>

Author: fmount

api/v1beta1/conditions.go

@@ -23,6 +23,8 @@ import (
 const (
 	// GlanceAPIReadyCondition Status=True condition which indicates if the GlanceAPI is configured and operational
 	GlanceAPIReadyCondition condition.Type = "GlanceAPIReady"
+	// CinderCondition
+	CinderCondition= "CinderReady"
 )
 
 // Glance Reasons used by API objects.
@@ -35,7 +37,10 @@ const (
 	//
 	// GlanceAPIReadyInitMessage
 	GlanceAPIReadyInitMessage = "GlanceAPI not started"
-
 	// GlanceAPIReadyErrorMessage
 	GlanceAPIReadyErrorMessage = "GlanceAPI error occured %s"
+	// CinderInitMessage
+	CinderInitMessage = "Waiting for Cinder resources"
+	// CinderReadyMessage
+	CinderReadyMessage = "Cinder resources exist"
 )

controllers/glance_controller.go

@@ -149,11 +149,13 @@ func (r *GlanceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res
 		return ctrl.Result{}, nil
 	}
 
-	//
-	// initialize status
-	//
-	//if instance.Status.Conditions == nil {
-	instance.Status.Conditions = condition.Conditions{}
+	// initialize status if Conditions is nil, but do not reset if it already
+	// exists
+	isNewInstance := instance.Status.Conditions == nil
+	if isNewInstance {
+		instance.Status.Conditions = condition.Conditions{}
+	}
+
 	// initialize conditions used later as Status=Unknown
 	cl := condition.CreateList(
 		condition.UnknownCondition(condition.DBReadyCondition, condition.InitReason, condition.DBReadyInitMessage),
@@ -162,7 +164,6 @@ func (r *GlanceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res
 		condition.UnknownCondition(condition.InputReadyCondition, condition.InitReason, condition.InputReadyInitMessage),
 		condition.UnknownCondition(condition.ServiceConfigReadyCondition, condition.InitReason, condition.ServiceConfigReadyInitMessage),
 		condition.UnknownCondition(glancev1.GlanceAPIReadyCondition, condition.InitReason, glancev1.GlanceAPIReadyInitMessage),
-		// right now we have no dedicated KeystoneServiceReadyInitMessage
 		condition.UnknownCondition(condition.KeystoneServiceReadyCondition, condition.InitReason, ""),
 		condition.UnknownCondition(condition.NetworkAttachmentsReadyCondition, condition.InitReason, condition.NetworkAttachmentsReadyInitMessage),
 		// service account, role, rolebinding conditions
@@ -171,9 +172,13 @@ func (r *GlanceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res
 		condition.UnknownCondition(condition.RoleBindingReadyCondition, condition.InitReason, condition.RoleBindingReadyInitMessage),
 		condition.UnknownCondition(condition.CronJobReadyCondition, condition.InitReason, condition.CronJobReadyInitMessage),
 	)
-
 	instance.Status.Conditions.Init(&cl)
 
+	if isNewInstance {
+		// Register overall status immediately to have an early feedback e.g. in the cli
+		return ctrl.Result{}, nil
+	}
+
 	if instance.Status.Hash == nil {
 		instance.Status.Hash = map[string]string{}
 	}
@@ -476,12 +481,7 @@ func (r *GlanceReconciler) reconcileInit(
 		r.Log.Info(fmt.Sprintf("Service '%s' - Job %s hash added - %s", instance.Name, jobDef.Name, instance.Status.Hash[glancev1.DbSyncHash]))
 	}
 	instance.Status.Conditions.MarkTrue(condition.DBSyncReadyCondition, condition.DBSyncReadyMessage)
-
-	// when job passed, mark NetworkAttachmentsReadyCondition ready
-	instance.Status.Conditions.MarkTrue(condition.NetworkAttachmentsReadyCondition, condition.NetworkAttachmentsReadyMessage)
-
 	// run Glance db sync - end
-
 	r.Log.Info(fmt.Sprintf("Reconciled Service '%s' init successfully", instance.Name))
 	return ctrl.Result{}, nil
 }

controllers/glanceapi_controller.go

@@ -23,10 +23,8 @@ import (
 	"time"
 
 	batchv1 "k8s.io/api/batch/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
@@ -152,6 +150,7 @@ func (r *GlanceAPIReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	instance.Status.Conditions = condition.Conditions{}
 	// initialize conditions used later as Status=Unknown
 	cl := condition.CreateList(
+		condition.UnknownCondition(glancev1.CinderCondition, condition.InitReason, glancev1.CinderInitMessage),
 		condition.UnknownCondition(condition.ExposeServiceReadyCondition, condition.InitReason, condition.ExposeServiceReadyInitMessage),
 		condition.UnknownCondition(condition.InputReadyCondition, condition.InitReason, condition.InputReadyInitMessage),
 		condition.UnknownCondition(condition.ServiceConfigReadyCondition, condition.InitReason, condition.ServiceConfigReadyInitMessage),
@@ -583,12 +582,16 @@ func (r *GlanceAPIReconciler) reconcileNormal(ctx context.Context, instance *gla
 		case backendToken[1] == "cinder":
 			cinder := &cinderv1.Cinder{}
 			err := r.Get(ctx, types.NamespacedName{Namespace: instance.Namespace, Name: glance.CinderName}, cinder)
-			if err != nil {
-				if errors.IsNotFound(err) {
-					// Request object not found, can't run GlanceAPI with this config
-					r.Log.Info("Cinder resource not found. Waiting for it to be deployed")
-					return ctrl.Result{RequeueAfter: time.Duration(10) * time.Second}, nil
-				}
+			if err != nil && !k8s_errors.IsNotFound(err) {
+				// Request object not found, GlanceAPI can't be executed with this config
+				r.Log.Info("Cinder resource not found. Waiting for it to be deployed")
+				instance.Status.Conditions.Set(condition.FalseCondition(
+					glancev1.CinderCondition,
+					condition.RequestedReason,
+					condition.SeverityInfo,
+					glancev1.CinderInitMessage),
+				)
+				return ctrl.Result{RequeueAfter: time.Duration(10) * time.Second}, nil
 			}
 			// Cinder CR is found, we can unblock glance deployment because
 			// it represents a valid backend.
@@ -599,6 +602,10 @@ func (r *GlanceAPIReconciler) reconcileNormal(ctx context.Context, instance *gla
 			imageConv = true
 		}
 	}
+	// If we reach this point, it means that either Cinder is not a backend for Glance
+	// or, in case Cinder is a backend for the current GlanceAPI, the associated resources
+	// are present in the control plane
+	instance.Status.Conditions.MarkTrue(glancev1.CinderCondition, glancev1.CinderReadyMessage)
 
 	// Generate service config
 	err = r.generateServiceConfig(ctx, helper, instance, &configVars, imageConv)
@@ -684,7 +691,6 @@ func (r *GlanceAPIReconciler) reconcileNormal(ctx context.Context, instance *gla
 	//
 	// TODO check when/if Init, Update, or Upgrade should/could be skipped
 	//
-
 	var serviceAnnotations map[string]string
 	// networks to attach to
 	serviceAnnotations, ctrlResult, err = ensureNAD(ctx, &instance.Status.Conditions, instance.Spec.NetworkAttachments, helper)
@@ -1228,7 +1234,7 @@ func (r *GlanceAPIReconciler) glanceAPIRefresh(
 ) error {
 	sts, err := statefulset.GetStatefulSetWithName(ctx, h, fmt.Sprintf("%s-api", instance.Name), instance.Namespace)
 	if err != nil {
-		if errors.IsNotFound(err) {
+		if k8s_errors.IsNotFound(err) {
 			// Request object not found
 			r.Log.Info(fmt.Sprintf("GlanceAPI %s-api: Statefulset not found.", instance.Name))
 			return nil