Use randomly generated API groups in TestKubeClientOwnerRef.

I think this is another aspect of the test flakes we're trying to fix. This matters especially for the "Multiple Pinnipeds" test environment where two copies of the test suite are running concurrently.

Signed-off-by: Matt Moyer <moyerm@vmware.com>
This commit is contained in:
Matt Moyer 2021-03-02 15:41:21 -06:00
parent 45f57939af
commit df27c2e1fc
No known key found for this signature in database
GPG Key ID: EAE88AD172C5AE2D

View File

@ -5,6 +5,7 @@ package integration
import ( import (
"context" "context"
"fmt"
"testing" "testing"
"time" "time"
@ -75,15 +76,18 @@ func TestKubeClientOwnerRef(t *testing.T) {
UID: parentSecret.UID, UID: parentSecret.UID,
} }
snorlaxAPIGroup := fmt.Sprintf("%s.snorlax.dev", library.RandHex(t, 8))
parentAPIService, err := regularAggregationClient.ApiregistrationV1().APIServices().Create( parentAPIService, err := regularAggregationClient.ApiregistrationV1().APIServices().Create(
ctx, ctx,
&apiregistrationv1.APIService{ &apiregistrationv1.APIService{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "v1.snorlax.dev", Name: "v1." + snorlaxAPIGroup,
Labels: map[string]string{"pinniped.dev/test": ""},
Annotations: map[string]string{"pinniped.dev/testName": t.Name()},
}, },
Spec: apiregistrationv1.APIServiceSpec{ Spec: apiregistrationv1.APIServiceSpec{
Version: "v1", Version: "v1",
Group: "snorlax.dev", Group: snorlaxAPIGroup,
GroupPriorityMinimum: 10_000, GroupPriorityMinimum: 10_000,
VersionPriority: 500, VersionPriority: 500,
}, },
@ -183,16 +187,19 @@ func TestKubeClientOwnerRef(t *testing.T) {
}) })
// cluster scoped API service should be owned by the other one we created above // cluster scoped API service should be owned by the other one we created above
pandasAPIGroup := fmt.Sprintf("%s.pandas.dev", library.RandHex(t, 8))
apiService, err := ownerRefClient.Aggregation.ApiregistrationV1().APIServices().Create( apiService, err := ownerRefClient.Aggregation.ApiregistrationV1().APIServices().Create(
ctx, ctx,
&apiregistrationv1.APIService{ &apiregistrationv1.APIService{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "v1.pandas.dev", Name: "v1." + pandasAPIGroup,
OwnerReferences: nil, // no owner refs set OwnerReferences: nil, // no owner refs set
Labels: map[string]string{"pinniped.dev/test": ""},
Annotations: map[string]string{"pinniped.dev/testName": t.Name()},
}, },
Spec: apiregistrationv1.APIServiceSpec{ Spec: apiregistrationv1.APIServiceSpec{
Version: "v1", Version: "v1",
Group: "pandas.dev", Group: pandasAPIGroup,
GroupPriorityMinimum: 10_000, GroupPriorityMinimum: 10_000,
VersionPriority: 500, VersionPriority: 500,
}, },