Add a Condition when Upgrade nmot possible

Create a new `*Error` Condition when the Upgrade preconditions
are not met (ie, an AuthService/RateLimitService exists).

Signed-off-by: Alvaro Saurin <[email protected]>

Author: inercia

pkg/apis/getambassador/v2/ambassadorinstallation_types.go

@@ -164,6 +164,7 @@ const (
 	ReasonUninstallError      AmbInsConditionReason = "UninstallError"
 	ReasonParametersError     AmbInsConditionReason = "ParametersError"
 	ReasonDuplicateError      AmbInsConditionReason = "DuplicateError"
+	ReasonUpgradePrecondError AmbInsConditionReason = "UpgradePrecondError"
 )
 
 func (s *AmbassadorInstallationStatus) ToMap() (map[string]interface{}, error) {

pkg/controller/ambassadorinstallation/reconcile.go

@@ -292,14 +292,35 @@ func (r *ReconcileAmbassadorInstallation) Reconcile(request reconcile.Request) (
 					Version: "v2",
 					Kind:    "AuthService",
 				}, request.Namespace)
+
 				if err != nil {
-					log.Error(err, "Could not look up AuthService in the cluster")
-					return reconcile.Result{}, err
+					message := "could not look up AuthService in the cluster"
+					err = fmt.Errorf(message)
+					log.Error(err, "")
+
+					status.SetCondition(ambassador.AmbInsCondition{
+						Type:    ambassador.ConditionReleaseFailed,
+						Status:  ambassador.StatusTrue,
+						Reason:  ambassador.ReasonUpgradePrecondError,
+						Message: message,
+					})
+					_ = r.updateResourceStatus(ambIns, status)
+					return reconcile.Result{RequeueAfter: r.checkInterval}, err
 				}
+
 				if len(authServiceList.Items) > 0 {
-					err = fmt.Errorf("AuthService(s) exist in the cluster, please remove to upgrade to AES")
+					message := "AuthService(s) exist in the cluster, please remove to upgrade to AES"
+					err = fmt.Errorf(message)
 					log.Error(err, "")
-					return reconcile.Result{}, err
+
+					status.SetCondition(ambassador.AmbInsCondition{
+						Type:    ambassador.ConditionReleaseFailed,
+						Status:  ambassador.StatusTrue,
+						Reason:  ambassador.ReasonUpgradePrecondError,
+						Message: message,
+					})
+					_ = r.updateResourceStatus(ambIns, status)
+					return reconcile.Result{RequeueAfter: r.checkInterval}, err
 				}
 
 				log.Info("Checking for RateLimitService...")
@@ -308,14 +329,35 @@ func (r *ReconcileAmbassadorInstallation) Reconcile(request reconcile.Request) (
 					Version: "v2",
 					Kind:    "RateLimitService",
 				}, request.Namespace)
+
 				if err != nil {
-					log.Error(err, "Could not look up RateLimitService in the cluster")
-					return reconcile.Result{}, err
+					message := "could not look up RateLimitService in the cluster"
+					err = fmt.Errorf(message)
+					log.Error(err, "")
+
+					status.SetCondition(ambassador.AmbInsCondition{
+						Type:    ambassador.ConditionReleaseFailed,
+						Status:  ambassador.StatusTrue,
+						Reason:  ambassador.ReasonUpgradePrecondError,
+						Message: message,
+					})
+					_ = r.updateResourceStatus(ambIns, status)
+					return reconcile.Result{RequeueAfter: r.checkInterval}, err
 				}
+
 				if len(rateLimitServiceList.Items) > 0 {
-					err = fmt.Errorf("RateLimitService(s) exist in the cluster, please remove to upgrade to AES")
+					message := "RateLimitService(s) exist in the cluster, please remove to upgrade to AES"
+					err = fmt.Errorf(message)
 					log.Error(err, "")
-					return reconcile.Result{}, err
+
+					status.SetCondition(ambassador.AmbInsCondition{
+						Type:    ambassador.ConditionReleaseFailed,
+						Status:  ambassador.StatusTrue,
+						Reason:  ambassador.ReasonUpgradePrecondError,
+						Message: message,
+					})
+					_ = r.updateResourceStatus(ambIns, status)
+					return reconcile.Result{RequeueAfter: r.checkInterval}, err
 				}
 
 				isMigrating = true

pkg/controller/ambassadorinstallation/reconcile_utils.go

@@ -3,9 +3,10 @@ package ambassadorinstallation
 import (
 	"context"
 	"fmt"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sort"
 
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"