fix(unit): fix tests involving CRD status

Change the default `crd` function to return appropriate status as to
pass the requirement checks. Also, make some minor logging improvements.

Author: Jeff Peeler

pkg/controller/operators/olm/operator_test.go

@@ -555,6 +555,18 @@ func crd(name string, version string) *v1beta1.CustomResourceDefinition {
 				Kind: name,
 			},
 		},
+		Status: v1beta1.CustomResourceDefinitionStatus{
+			Conditions: []v1beta1.CustomResourceDefinitionCondition{
+				{
+					Type:   v1beta1.Established,
+					Status: v1beta1.ConditionTrue,
+				},
+				{
+					Type:   v1beta1.NamesAccepted,
+					Status: v1beta1.ConditionTrue,
+				},
+			},
+		},
 	}
 }
 

pkg/controller/operators/olm/requirements.go

@@ -30,8 +30,8 @@ func (a *Operator) requirementStatus(strategyDetailsDeployment *install.Strategy
 		// check if CRD exists - this verifies group, version, and kind, so no need for GVK check via discovery
 		crd, err := a.lister.APIExtensionsV1beta1().CustomResourceDefinitionLister().Get(r.Name)
 		if err != nil {
-			a.Log.Debugf("Setting 'met' to false, %v with err: %v", r.Name, err)
 			status.Status = v1alpha1.RequirementStatusReasonNotPresent
+			a.Log.Debugf("Setting 'met' to false, %v with status %v, with err: %v", r.Name, status, err)
 			met = false
 			statuses = append(statuses, status)
 			continue
@@ -53,6 +53,7 @@ func (a *Operator) requirementStatus(strategyDetailsDeployment *install.Strategy
 
 			if !served {
 				status.Status = v1alpha1.RequirementStatusReasonNotPresent
+				a.Log.Debugf("Setting 'met' to false, %v with status %v, CRD version %v not found", r.Name, status, r.Version)
 				met = false
 				statuses = append(statuses, status)
 				continue
@@ -81,6 +82,7 @@ func (a *Operator) requirementStatus(strategyDetailsDeployment *install.Strategy
 		} else {
 			status.Status = v1alpha1.RequirementStatusReasonNotAvailable
 			met = false
+			a.Log.Debugf("Setting 'met' to false, %v with status %v, established=%v, namesAccepted=%v", r.Name, status, established, namesAccepted)
 			statuses = append(statuses, status)
 		}
 	}

pkg/controller/operators/olm/requirements_test.go

@@ -459,7 +459,7 @@ func TestRequirementAndPermissionStatus(t *testing.T) {
 				namespace,
 				"",
 				installStrategy("csv1-dep", nil, nil),
-				[]*v1beta1.CustomResourceDefinition{crd("c1", "v2")},
+				[]*v1beta1.CustomResourceDefinition{crd("c1", "version-not-found")},
 				nil,
 				v1alpha1.CSVPhasePending,
 			),
@@ -480,7 +480,7 @@ func TestRequirementAndPermissionStatus(t *testing.T) {
 			expectedError: nil,
 		},
 		{
-			description: "RequirementNotMet/NamesConflictedCRDVersion",
+			description: "RequirementNotMet/NamesConflictedCRD",
 			csv: csv("csv1",
 				namespace,
 				"",
@@ -491,7 +491,45 @@ func TestRequirementAndPermissionStatus(t *testing.T) {
 			),
 			existingObjs: nil,
 			existingExtObjs: []runtime.Object{
-				crd("c1", "v2"),
+				func() *v1beta1.CustomResourceDefinition {
+					newCRD := crd("c1", "v2")
+					// condition order: established, name accepted
+					newCRD.Status.Conditions[0].Status = v1beta1.ConditionTrue
+					newCRD.Status.Conditions[1].Status = v1beta1.ConditionFalse
+					return newCRD
+				}(),
+			},
+			met: false,
+			expectedRequirementStatuses: map[gvkn]v1alpha1.RequirementStatus{
+				{"apiextensions.k8s.io", "v1beta1", "CustomResourceDefinition", "c1group"}: {
+					Group:   "apiextensions.k8s.io",
+					Version: "v1beta1",
+					Kind:    "CustomResourceDefinition",
+					Name:    "c1group",
+					Status:  v1alpha1.RequirementStatusReasonNotAvailable,
+				},
+			},
+			expectedError: nil,
+		},
+		{
+			description: "RequirementNotMet/CRDResourceInactive",
+			csv: csv("csv1",
+				namespace,
+				"",
+				installStrategy("csv1-dep", nil, nil),
+				[]*v1beta1.CustomResourceDefinition{crd("c1", "v2")},
+				nil,
+				v1alpha1.CSVPhasePending,
+			),
+			existingObjs: nil,
+			existingExtObjs: []runtime.Object{
+				func() *v1beta1.CustomResourceDefinition {
+					newCRD := crd("c1", "v2")
+					// condition order: established, name accepted
+					newCRD.Status.Conditions[0].Status = v1beta1.ConditionFalse
+					newCRD.Status.Conditions[1].Status = v1beta1.ConditionTrue
+					return newCRD
+				}(),
 			},
 			met: false,
 			expectedRequirementStatuses: map[gvkn]v1alpha1.RequirementStatus{