djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #783 from enj/enj/t/ignore_test_pods

Browse Source 
test/integration: ignore restarts associated with test pods
This commit is contained in:
Matt Moyer 2021-08-17 11:00:19 -07:00 committed by GitHub
commit d57637ee56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/integration/concierge_impersonation_proxy_test.go
View File

@ -944,21 +944,17 @@ func TestImpersonationProxy(t *testing.T) { //nolint:gocyclo // yeah, it's compl
return // stop test early since the token request API is not enabled on this cluster - other errors are caught below return // stop test early since the token request API is not enabled on this cluster - other errors are caught below
} }
pod, err := kubeClient.Pods(namespaceName).Create(ctx, &corev1.Pod{ pod := testlib.CreatePod(ctx, t, "impersonation-proxy", namespaceName,
ObjectMeta: metav1.ObjectMeta{ corev1.PodSpec{
GenerateName: "test-impersonation-proxy-",
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{ Containers: []corev1.Container{
{ {
Name: "ignored-but-required", Name: "ignored-but-required",
Image: "does-not-matter", Image: "busybox",
Command: []string{"sh", "-c", "sleep 3600"},
}, },
}, },
ServiceAccountName: saName, ServiceAccountName: saName,
}, })
}, metav1.CreateOptions{})
require.NoError(t, err)
tokenRequestBadAudience, err := kubeClient.ServiceAccounts(namespaceName).CreateToken(ctx, saName, &authenticationv1.TokenRequest{ tokenRequestBadAudience, err := kubeClient.ServiceAccounts(namespaceName).CreateToken(ctx, saName, &authenticationv1.TokenRequest{
Spec: authenticationv1.TokenRequestSpec{ Spec: authenticationv1.TokenRequestSpec{

14
test/integration/whoami_test.go
View File

@ -164,21 +164,17 @@ func TestWhoAmI_ServiceAccount_TokenRequest(t *testing.T) {
return // stop test early since the token request API is not enabled on this cluster - other errors are caught below return // stop test early since the token request API is not enabled on this cluster - other errors are caught below
} }
pod, err := kubeClient.Pods(ns.Name).Create(ctx, &corev1.Pod{ pod := testlib.CreatePod(ctx, t, "whoami", ns.Name,
ObjectMeta: metav1.ObjectMeta{ corev1.PodSpec{
GenerateName: "test-whoami-",
},
Spec: corev1.PodSpec{
Containers: []corev1.Container{ Containers: []corev1.Container{
{ {
Name: "ignored-but-required", Name: "ignored-but-required",
Image: "does-not-matter", Image: "busybox",
Command: []string{"sh", "-c", "sleep 3600"},
}, },
}, },
ServiceAccountName: sa.Name, ServiceAccountName: sa.Name,
}, })
}, metav1.CreateOptions{})
require.NoError(t, err)
tokenRequestBadAudience, err := kubeClient.ServiceAccounts(ns.Name).CreateToken(ctx, sa.Name, &authenticationv1.TokenRequest{ tokenRequestBadAudience, err := kubeClient.ServiceAccounts(ns.Name).CreateToken(ctx, sa.Name, &authenticationv1.TokenRequest{
Spec: authenticationv1.TokenRequestSpec{ Spec: authenticationv1.TokenRequestSpec{

4
test/testlib/env.go
View File

@ -142,8 +142,8 @@ func IntegrationEnv(t *testing.T) *TestEnv {
memoizedTestEnvsByTest.Store(t, &result) memoizedTestEnvsByTest.Store(t, &result)
// In every integration test, assert that no pods in our namespaces restart during the test. // In every integration test, assert that no pods in our namespaces restart during the test.
assertNoRestartsDuringTest(t, result.ConciergeNamespace, "") assertNoRestartsDuringTest(t, result.ConciergeNamespace, "!pinniped.dev/test")
assertNoRestartsDuringTest(t, result.SupervisorNamespace, "") assertNoRestartsDuringTest(t, result.SupervisorNamespace, "!pinniped.dev/test")
return &result return &result
} }