Skip to content

Commit 76d36bc

Browse files
authored
Merge pull request kubernetes-sigs#312 from justinsb/sort_apiresources
Sort APIResources into a consistent order
2 parents b2c262e + 9e4c90f commit 76d36bc

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

mockkubeapiserver/apiresourcelist.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package mockkubeapiserver
1818

1919
import (
2020
"context"
21+
"sort"
2122

2223
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2324
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -47,5 +48,19 @@ func (req *apiResourceList) Run(ctx context.Context, s *MockKubeAPIServer) error
4748
}
4849
response.APIResources = append(response.APIResources, resource)
4950
}
51+
52+
// Return in a stable order, for more test predictability
53+
sort.Slice(response.APIResources, func(i, j int) bool {
54+
l := response.APIResources[i]
55+
r := response.APIResources[j]
56+
57+
if l.Group != r.Group {
58+
return l.Group < r.Group
59+
}
60+
if l.Kind != r.Kind {
61+
return l.Kind < r.Kind
62+
}
63+
return false
64+
})
5065
return req.writeResponse(response)
5166
}

0 commit comments

Comments
 (0)