Merge pull request #267 from swghosh/status-e2e-bug

Avoid e2e to pass with faulty status

Author: openshift-merge-bot[bot]

test/e2e/overrides_test.go

@@ -13,6 +13,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	k8sresource "k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 var _ = Describe("Overrides test", Ordered, func() {
@@ -29,6 +30,14 @@ var _ = Describe("Overrides test", Ordered, func() {
 				certManagerCAInjectorDeploymentControllerName},
 			validOperatorStatusConditions)
 		Expect(err).NotTo(HaveOccurred(), "Operator is expected to be available")
+
+		By("Wait for non-empty generations status")
+		err = verifyDeploymentGenerationIsNotEmpty(certmanageroperatorclient, []metav1.ObjectMeta{
+			{Name: certmanagerControllerDeployment, Namespace: operandNamespace},
+			{Name: certmanagerWebhookDeployment, Namespace: operandNamespace},
+			{Name: certmanagerCAinjectorDeployment, Namespace: operandNamespace},
+		})
+		Expect(err).NotTo(HaveOccurred(), "Operator status Generations should contain deployment last generation")
 	})
 
 	Context("When adding valid cert-manager controller override args", func() {

test/e2e/utils_test.go

@@ -81,15 +81,20 @@ func verifyOperatorStatusCondition(client *certmanoperatorclient.Clientset, cont
 					return false, nil
 				}
 
+				var condMatchCount int
 				for _, cond := range operator.Status.Conditions {
 					if status, exists := expectedConditionMap[strings.TrimPrefix(cond.Type, controllerNames[index])]; exists {
+						condMatchCount += 1
+
 						if cond.Status != status {
 							return false, nil
 						}
 					}
 				}
 
-				return true, nil
+				// [retry]    false:  when NOT all expected conditions were found
+				// [no-retry] true:   when all expected conditions were found
+				return condMatchCount == len(expectedConditionMap), nil
 			})
 			errs[index] = err
 		}(index)
@@ -99,6 +104,53 @@ func verifyOperatorStatusCondition(client *certmanoperatorclient.Clientset, cont
 	return errors.NewAggregate(errs)
 }
 
+func verifyDeploymentGenerationIsNotEmpty(client *certmanoperatorclient.Clientset, deployments []metav1.ObjectMeta) error {
+	var wg sync.WaitGroup
+	errs := make([]error, len(deployments))
+	for index, deployMeta := range deployments {
+		wg.Add(1)
+
+		go func(idx int, nameAndNs *metav1.ObjectMeta) {
+			defer wg.Done()
+
+			err := wait.PollUntilContextTimeout(context.TODO(), time.Second*1, time.Minute*5, true, func(context.Context) (bool, error) {
+				operator, err := client.OperatorV1alpha1().CertManagers().Get(context.TODO(), "cluster", metav1.GetOptions{})
+				if err != nil {
+					if apierrors.IsNotFound(err) {
+						return false, nil
+					}
+					return false, err
+				}
+
+				if operator.DeletionTimestamp != nil {
+					return false, nil
+				}
+
+				var exists bool
+				for _, gen := range operator.Status.Generations {
+					// match deployment: name and namespace, group, resource
+					if gen.Name != nameAndNs.Name || gen.Namespace != nameAndNs.Namespace ||
+						gen.Group != "apps" || gen.Resource != "deployments" {
+						continue
+					}
+					exists = true
+
+					if gen.LastGeneration <= 0 {
+						return false, nil
+					}
+				}
+
+				return exists, nil
+			})
+
+			errs[idx] = err
+		}(index, &deployMeta)
+	}
+	wg.Wait()
+
+	return errors.NewAggregate(errs)
+}
+
 // resetCertManagerState is used to revert back to the default cert-manager operands' state
 func resetCertManagerState(ctx context.Context, client *certmanoperatorclient.Clientset, loader library.DynamicResourceLoader) error {
 	// update operator spec to empty *Config and set operatorSpec to default values