From df27c2e1fca30972457d7bd4c97d9261ab023f6b Mon Sep 17 00:00:00 2001 From: Matt Moyer Date: Tue, 2 Mar 2021 15:41:21 -0600 Subject: [PATCH] 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 --- test/integration/kubeclient_test.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/test/integration/kubeclient_test.go b/test/integration/kubeclient_test.go index 6cdaa56d..e5f759c5 100644 --- a/test/integration/kubeclient_test.go +++ b/test/integration/kubeclient_test.go @@ -5,6 +5,7 @@ package integration import ( "context" + "fmt" "testing" "time" @@ -75,15 +76,18 @@ func TestKubeClientOwnerRef(t *testing.T) { UID: parentSecret.UID, } + snorlaxAPIGroup := fmt.Sprintf("%s.snorlax.dev", library.RandHex(t, 8)) parentAPIService, err := regularAggregationClient.ApiregistrationV1().APIServices().Create( ctx, &apiregistrationv1.APIService{ 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{ Version: "v1", - Group: "snorlax.dev", + Group: snorlaxAPIGroup, GroupPriorityMinimum: 10_000, 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 + pandasAPIGroup := fmt.Sprintf("%s.pandas.dev", library.RandHex(t, 8)) apiService, err := ownerRefClient.Aggregation.ApiregistrationV1().APIServices().Create( ctx, &apiregistrationv1.APIService{ ObjectMeta: metav1.ObjectMeta{ - Name: "v1.pandas.dev", + Name: "v1." + pandasAPIGroup, 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{ Version: "v1", - Group: "pandas.dev", + Group: pandasAPIGroup, GroupPriorityMinimum: 10_000, VersionPriority: 500, },