Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automated backport of #1431: Fix gateway failover test #1442

Merged
merged 1 commit into from
Oct 24, 2023
Merged

Automated backport of #1431: Fix gateway failover test #1442

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions test/e2e/framework/gateways.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,26 @@ var gatewayGVR = &schema.GroupVersionResource{
Resource: "gateways",
}

func (f *Framework) AwaitGatewayWithStatus(cluster ClusterIndex, name, status string) *unstructured.Unstructured {
func findGateway(cluster ClusterIndex, name string) (*unstructured.Unstructured, error) {
gwClient := gatewayClient(cluster)
// Set short name without a suffix as exists in the Gateway resource
name = strings.Split(name, ".")[0]
resGw, err := gwClient.Get(context.TODO(), name, metav1.GetOptions{})

if apierrors.IsNotFound(err) {
// Some environments sets a node in Gateway resource without a suffix
resGw, err = gwClient.Get(context.TODO(), strings.Split(name, ".")[0], metav1.GetOptions{})
}

if apierrors.IsNotFound(err) {
return nil, nil //nolint:nilnil // We want to repeat but let the checker known that nothing was found.
}

return resGw, err
}

func (f *Framework) AwaitGatewayWithStatus(cluster ClusterIndex, name, status string) *unstructured.Unstructured {
obj := AwaitUntil(fmt.Sprintf("await Gateway on %q with status %q", name, status),
func() (interface{}, error) {
resGw, err := gwClient.Get(context.TODO(), name, metav1.GetOptions{})
if apierrors.IsNotFound(err) {
return nil, nil //nolint:nilnil // We want to repeat but let the checker known that nothing was found.
}
return resGw, err
return findGateway(cluster, name)
},
func(result interface{}) (bool, string, error) {
if result == nil {
Expand Down Expand Up @@ -105,16 +114,9 @@ func (f *Framework) AwaitGatewayRemoved(cluster ClusterIndex, name string) {
}

func (f *Framework) AwaitGatewayFullyConnected(cluster ClusterIndex, name string) *unstructured.Unstructured {
gwClient := gatewayClient(cluster)
// Set short name without a suffix as exists in the Gateway resource
name = strings.Split(name, ".")[0]
obj := AwaitUntil(fmt.Sprintf("await Gateway on %q with status active and connections UP", name),
func() (interface{}, error) {
resGw, err := gwClient.Get(context.TODO(), name, metav1.GetOptions{})
if apierrors.IsNotFound(err) {
return nil, nil //nolint:nilnil // We want to repeat but let the checker known that nothing was found.
}
return resGw, err
return findGateway(cluster, name)
},
func(result interface{}) (bool, string, error) {
if result == nil {
Expand Down