Skip to content

Commit 048c75a

Browse files
committed
[Speculative] add IDLE to list of safe catalog source connection status
Signed-off-by: perdasilva <[email protected]>
1 parent 74018e7 commit 048c75a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2929,7 +2929,7 @@ func updateInternalCatalog(t GinkgoTInterface, c operatorclient.ClientInterface,
29292929
before := fetchedInitialCatalog.Status.ConfigMapResource
29302930
after := catalog.Status.ConfigMapResource
29312931
if after != nil && after.LastUpdateTime.After(before.LastUpdateTime.Time) && after.ResourceVersion != before.ResourceVersion &&
2932-
catalog.Status.GRPCConnectionState.LastConnectTime.After(after.LastUpdateTime.Time) && catalog.Status.GRPCConnectionState.LastObservedState == "READY" {
2932+
catalog.Status.GRPCConnectionState.LastConnectTime.After(after.LastUpdateTime.Time) && (catalog.Status.GRPCConnectionState.LastObservedState == "READY" || catalog.Status.GRPCConnectionState.LastObservedState == "IDLE") {
29332933
fmt.Println("catalog updated")
29342934
return true
29352935
}

staging/operator-lifecycle-manager/test/e2e/util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ func registryPodHealthy(address string) bool {
311311
func catalogSourceRegistryPodSynced(catalog *operatorsv1alpha1.CatalogSource) bool {
312312
registry := catalog.Status.RegistryServiceStatus
313313
connState := catalog.Status.GRPCConnectionState
314-
if registry != nil && connState != nil && !connState.LastConnectTime.IsZero() && connState.LastObservedState == "READY" {
314+
if registry != nil && connState != nil && !connState.LastConnectTime.IsZero() && (connState.LastObservedState == "READY" || connState.LastObservedState == "IDLE") {
315315
fmt.Printf("catalog %s pod with address %s\n", catalog.GetName(), registry.Address())
316316
return registryPodHealthy(registry.Address())
317317
}

0 commit comments

Comments
 (0)