Skip to content

Commit

Permalink
Update helpers with PR feedback
Browse files Browse the repository at this point in the history
Signed-off-by: Nick Young <ynick@vmware.com>
  • Loading branch information
Nick Young committed Jul 12, 2022
1 parent 9c998f6 commit 675a132
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions conformance/utils/kubernetes/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ func GWCMustBeAccepted(t *testing.T, c client.Client, gwcName string, seconds in
}

controllerName = string(gwc.Spec.ControllerName)
return findConditionInList(t, gwc.Status.Conditions, "Accepted", "True", "Accepted"), nil
// Passing an empty string as the Reason means that any Reason will do.
return findConditionInList(t, gwc.Status.Conditions, "Accepted", "True", ""), nil
})
require.NoErrorf(t, waitErr, "error waiting for %s GatewayClass to have Accepted condition set to True: %v", gwcName, waitErr)

Expand All @@ -106,7 +107,8 @@ func NamespacesMustBeReady(t *testing.T, c client.Client, namespaces []string, s
t.Errorf("Error listing Gateways: %v", err)
}
for _, gw := range gwList.Items {
if !findConditionInList(t, gw.Status.Conditions, "Ready", "True", "Ready") {
// Passing an empty string as the Reason means that any Reason will do.
if !findConditionInList(t, gw.Status.Conditions, "Ready", "True", "") {
t.Logf("%s/%s Gateway not ready yet", ns, gw.Name)
return false, nil
}
Expand Down

0 comments on commit 675a132

Please sign in to comment.