fix(operatorgroup): Add new CSV failure due to operatorgroup incorrect

If no namespaces are matched selector in operator, CSV should have a failure status to indicate OperatorGroup incorrect. Also, a warning message for no-matched namespaces is added for visibility. Signed-off-by: Vu Dinh <vdinh@redhat.com>
operator-framework · May 9, 2019 · 693871f · 693871f
1 parent fb76336
commit 693871f
Show file tree

Hide file tree

Showing 5 changed files with 2,996 additions and 1 deletion.
diff --git a/pkg/api/apis/operators/v1alpha1/clusterserviceversion.go b/pkg/api/apis/operators/v1alpha1/clusterserviceversion.go
@@ -30,6 +30,7 @@ var uncopiableReasons = map[ConditionReason]struct{}{
 	CSVReasonNoTargetNamespaces:                          {},
 	CSVReasonUnsupportedOperatorGroup:                    {},
 	CSVReasonNoOperatorGroup:                             {},
+	CSVReasonOperatorGroupIncorrect:                      {},
 	CSVReasonTooManyOperatorGroups:                       {},
 	CSVReasonInterOperatorGroupOwnerConflict:             {},
 	CSVReasonCannotModifyStaticOperatorGroupProvidedAPIs: {},
@@ -44,6 +45,7 @@ var safeToAnnotateOperatorGroupReasons = map[ConditionReason]struct{}{
 	CSVReasonNoTargetNamespaces:                          {},
 	CSVReasonUnsupportedOperatorGroup:                    {},
 	CSVReasonNoOperatorGroup:                             {},
+	CSVReasonOperatorGroupIncorrect:                      {},
 	CSVReasonTooManyOperatorGroups:                       {},
 	CSVReasonInterOperatorGroupOwnerConflict:             {},
 	CSVReasonCannotModifyStaticOperatorGroupProvidedAPIs: {},

diff --git a/pkg/api/apis/operators/v1alpha1/clusterserviceversion_types.go b/pkg/api/apis/operators/v1alpha1/clusterserviceversion_types.go
@@ -241,7 +241,8 @@ const (
 	CSVReasonInvalidInstallModes                         ConditionReason = "InvalidInstallModes"
 	CSVReasonNoTargetNamespaces                          ConditionReason = "NoTargetNamespaces"
 	CSVReasonUnsupportedOperatorGroup                    ConditionReason = "UnsupportedOperatorGroup"
-	CSVReasonNoOperatorGroup                             ConditionReason = "NoOperatorGroup"
+	CSVReasonNoOperatorGroup                             ConditionReason = "OperatorGroupIncorrect"
+	CSVReasonOperatorGroupIncorrect                      ConditionReason = "NoOperatorGroup"
 	CSVReasonTooManyOperatorGroups                       ConditionReason = "TooManyOperatorGroups"
 	CSVReasonInterOperatorGroupOwnerConflict             ConditionReason = "InterOperatorGroupOwnerConflict"
 	CSVReasonCannotModifyStaticOperatorGroupProvidedAPIs ConditionReason = "CannotModifyStaticOperatorGroupProvidedAPIs"

diff --git a/pkg/controller/operators/olm/operator.go b/pkg/controller/operators/olm/operator.go
@@ -719,6 +719,7 @@ func (a *Operator) operatorGroupForCSV(csv *v1alpha1.ClusterServiceVersion, logg
 				logger.WithError(err).Warn("error adding operatorgroup annotations")
 				return nil, err
 			}
+			csv.SetPhaseWithEventIfChanged(v1alpha1.CSVPhaseFailed, v1alpha1.CSVReasonOperatorGroupIncorrect, "operatorgroup incorrect", now, a.recorder)
 			return nil, nil
 		}
 		logger.Info("csv in operatorgroup")

diff --git a/pkg/controller/operators/olm/operatorgroup.go b/pkg/controller/operators/olm/operatorgroup.go
@@ -715,6 +715,8 @@ func (a *Operator) getOperatorGroupTargets(op *v1.OperatorGroup) (map[string]str
 		matchedNamespaces, err := a.lister.CoreV1().NamespaceLister().List(selector)
 		if err != nil {
 			return nil, err
+		} else if len(matchedNamespaces) == 0 {
+			a.Log.Debugf("No namespaces are matched selector %#v\n", selector)
 		}
 
 		for _, ns := range matchedNamespaces {