github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #125973 from fxierh/sample-apiserver-e2e-race-fix

Browse Source 
Mark test cases which set up a sample-apiserver as serial
This commit is contained in:
Kubernetes Prow Robot 2024-07-09 06:02:04 -07:00 committed by GitHub
commit 42064e03c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/apimachinery/aggregator.go
View File

@ -131,6 +131,12 @@ func generateSampleAPIServerObjectNames(namespace string) sampleAPIServerObjectN
} }
} }
// SetUpSampleAPIServer sets up a sample-apiserver.
//
// Important:
// Test cases that call this function should be marked as serial due to potential conflicts
// with other test cases that also set up a sample-apiserver. For more information, see
// https://github.com/kubernetes/kubernetes/issues/119582#issuecomment-2215054411.
func SetUpSampleAPIServer(ctx context.Context, f *framework.Framework, aggrclient *aggregatorclient.Clientset, image string, n sampleAPIServerObjectNames, apiServiceGroupName, apiServiceVersion string) { func SetUpSampleAPIServer(ctx context.Context, f *framework.Framework, aggrclient *aggregatorclient.Clientset, image string, n sampleAPIServerObjectNames, apiServiceGroupName, apiServiceVersion string) {
ginkgo.By("Registering the sample API server.") ginkgo.By("Registering the sample API server.")
client := f.ClientSet client := f.ClientSet

5
test/e2e/apimachinery/openapiv3.go
View File

@ -168,8 +168,11 @@ var _ = SIGDescribe("OpenAPIV3", func() {
Release : v1.27 Release : v1.27
Testname: OpenAPI V3 Aggregated APIServer Testname: OpenAPI V3 Aggregated APIServer
Description: Create an Aggregated APIServer. The OpenAPI V3 for the aggregated apiserver MUST be aggregated by the aggregator and published. The specification MUST be round trippable. Description: Create an Aggregated APIServer. The OpenAPI V3 for the aggregated apiserver MUST be aggregated by the aggregator and published. The specification MUST be round trippable.
This test case is marked as serial due to potential conflicts with other test cases that set up a sample-apiserver.
For more information, see: https://github.com/kubernetes/kubernetes/issues/119582#issuecomment-2215054411.
*/ */
ginkgo.It("should contain OpenAPI V3 for Aggregated APIServer", func(ctx context.Context) { f.It("should contain OpenAPI V3 for Aggregated APIServer", f.WithSerial(), func(ctx context.Context) {
config, err := framework.LoadConfig() config, err := framework.LoadConfig()
framework.ExpectNoError(err) framework.ExpectNoError(err)
aggrclient, err := aggregatorclient.NewForConfig(config) aggrclient, err := aggregatorclient.NewForConfig(config)