Change OperatorUpgradeable type to string and add utils func

dinhxuanvu · dinhxuanvu · commit 07141ea34134 · 2020-12-03T09:33:51.000-05:00
Use string as OperatorUpgradeable type instead of intermediate
type ConditionType.

Add utils func FindConditionType to look up Condition type.

Signed-off-by: Vu Dinh &lt;vdinh@redhat.com&gt;
diff --git a/pkg/operators/v1/operatorcondition_types.go b/pkg/operators/v1/operatorcondition_types.go
@@ -6,7 +6,7 @@ import (
 
 const (
 	// OperatorUpgradeable indicates that the operator is upgradeable
-	OperatorUpgradeable ConditionType = "OperatorUpgradeable"
+	OperatorUpgradeable string = "OperatorUpgradeable"
 )
 
 // OperatorConditionSpec allows a cluster admin to convey information about the state of an operator to OLM, potentially overriding state reported by the operator.
diff --git a/pkg/operators/v1alpha1/clusterserviceversion_types.go b/pkg/operators/v1alpha1/clusterserviceversion_types.go
@@ -379,6 +379,7 @@ const (
 	CSVReasonCannotModifyStaticOperatorGroupProvidedAPIs ConditionReason = "CannotModifyStaticOperatorGroupProvidedAPIs"
 	CSVReasonDetectedClusterChange                       ConditionReason = "DetectedClusterChange"
 	CSVReasonInvalidWebhookDescription                   ConditionReason = "InvalidWebhookDescription"
+	CSVReasonOperatorConditionNotUpgradeable             ConditionReason = "OperatorConditionNotUpgradeable"
 )
 
 // HasCaResources returns true if the CSV has owned APIServices or Webhooks.

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`const (`
`8`	`8`	`// OperatorUpgradeable indicates that the operator is upgradeable`
`9`		`- OperatorUpgradeable ConditionType = "OperatorUpgradeable"`
	`9`	`+ OperatorUpgradeable string = "OperatorUpgradeable"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// OperatorConditionSpec allows a cluster admin to convey information about the state of an operator to OLM, potentially overriding state reported by the operator.`
Original file line number	Diff line number	Diff line change
`@@ -379,6 +379,7 @@ const (`
`379`	`379`	`CSVReasonCannotModifyStaticOperatorGroupProvidedAPIs ConditionReason = "CannotModifyStaticOperatorGroupProvidedAPIs"`
`380`	`380`	`CSVReasonDetectedClusterChange ConditionReason = "DetectedClusterChange"`
`381`	`381`	`CSVReasonInvalidWebhookDescription ConditionReason = "InvalidWebhookDescription"`
	`382`	`+ CSVReasonOperatorConditionNotUpgradeable ConditionReason = "OperatorConditionNotUpgradeable"`
`382`	`383`	`)`
`383`	`384`
`384`	`385`	`// HasCaResources returns true if the CSV has owned APIServices or Webhooks.`