Add new OctaviaAmphoraCertsReadyCondition

openstack-k8s-operators · Apr 24, 2024 · 1e170c5 · 1e170c5
1 parent 113ea27
commit 1e170c5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/api/v1beta1/conditions.go b/api/v1beta1/conditions.go
@@ -30,6 +30,8 @@ const (
 	OctaviaHousekeepingReadyCondition condition.Type = "OctaviaHousekeepingReady"
 
 	OctaviaWorkerReadyCondition condition.Type = "OctaviaWorkerReady"
+
+	OctaviaAmphoraCertsReadyCondition condition.Type = "OctaviaAmphoraCertsReady"
 )
 
 // Common Messages used by API objects
@@ -69,4 +71,13 @@ const (
 
 	// OctaviaAmphoraControllerReadyErrorMessage
 	OctaviaWorkerReadyErrorMessage = "OctaviaWorker error occured %s"
+
+	//
+	// OctaviaAmphoraCertsReady condition messages
+	//
+	// OctaviaAmphoraCertsReadyInitMessage
+	OctaviaAmphoraCertsReadyInitMessage = "Octavia Amphora certificates are not initialized"
+
+	// OctaviaAmphoraCertsReadyErrorMessage
+	OctaviaAmphoraCertsReadyErrorMessage = "Octavia Amphora certificates error occured %s"
 )
diff --git a/controllers/octavia_controller.go b/controllers/octavia_controller.go
@@ -188,6 +188,7 @@ func (r *OctaviaReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re
 		condition.UnknownCondition(condition.NetworkAttachmentsReadyCondition, condition.InitReason, condition.NetworkAttachmentsReadyInitMessage),
 		condition.UnknownCondition(condition.ExposeServiceReadyCondition, condition.InitReason, condition.ExposeServiceReadyInitMessage),
 		condition.UnknownCondition(condition.DeploymentReadyCondition, condition.InitReason, condition.DeploymentReadyInitMessage),
+		condition.UnknownCondition(octaviav1.OctaviaAmphoraCertsReadyCondition, condition.InitReason, octaviav1.OctaviaAmphoraCertsReadyInitMessage),
 		amphoraControllerInitCondition(octaviav1.HealthManager),
 		amphoraControllerInitCondition(octaviav1.Housekeeping),
 		amphoraControllerInitCondition(octaviav1.Worker),
@@ -505,13 +506,14 @@ func (r *OctaviaReconciler) reconcileNormal(ctx context.Context, instance *octav
 	err = octavia.EnsureAmphoraCerts(ctx, instance, helper, &Log)
 	if err != nil {
 		instance.Status.Conditions.Set(condition.FalseCondition(
-			condition.ServiceConfigReadyCondition,
+			octaviav1.OctaviaAmphoraCertsReadyCondition,
 			condition.ErrorReason,
 			condition.SeverityWarning,
-			condition.ServiceConfigReadyErrorMessage,
+			octaviav1.OctaviaAmphoraCertsReadyErrorMessage,
 			err.Error()))
 		return ctrl.Result{}, err
 	}
+	instance.Status.Conditions.MarkTrue(octaviav1.OctaviaAmphoraCertsReadyCondition, octaviav1.OctaviaAmphoraCertsReadyInitMessage)
 
 	if err = octavia.EnsureQuotas(ctx, instance, &r.Log, helper); err != nil {
 		instance.Status.Conditions.Set(condition.FalseCondition(