Skip to content

Commit 350edbf

Browse files
committed
Update verifyDeploymentGenerationIsNotEmpty
* to refactor with similar changes as of verifyOperatorStatusCondition Signed-off-by: Swarup Ghosh <[email protected]>
1 parent a5f82f2 commit 350edbf

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

test/e2e/utils_test.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ var subscriptionSchema = schema.GroupVersionResource{
7373

7474
func verifyDeploymentGenerationIsNotEmpty(client *certmanoperatorclient.Clientset, deployments []metav1.ObjectMeta) error {
7575
var wg sync.WaitGroup
76+
var lastFetchedGenerationStatus []opv1.GenerationStatus
77+
7678
errs := make([]error, len(deployments))
7779
for index, deployMeta := range deployments {
7880
wg.Add(1)
@@ -93,6 +95,8 @@ func verifyDeploymentGenerationIsNotEmpty(client *certmanoperatorclient.Clientse
9395
return false, nil
9496
}
9597

98+
lastFetchedGenerationStatus = operator.Status.DeepCopy().Generations
99+
96100
var exists bool
97101
for _, gen := range operator.Status.Generations {
98102
// match deployment: name and namespace, group, resource
@@ -115,7 +119,14 @@ func verifyDeploymentGenerationIsNotEmpty(client *certmanoperatorclient.Clientse
115119
}
116120
wg.Wait()
117121

118-
return errors.NewAggregate(errs)
122+
if err := errors.NewAggregate(errs); err != nil {
123+
prettyGens, _ := json.Marshal(lastFetchedGenerationStatus)
124+
log.Printf("found status.generations: %s", prettyGens)
125+
126+
return fmt.Errorf("could not verify deployment generation status : %v", err)
127+
}
128+
129+
return nil
119130
}
120131

121132
// resetCertManagerState is used to revert back to the default cert-manager operands' state

0 commit comments

Comments
 (0)