Skip to content

Add retries for token creation in tests #793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vladem wants to merge 2 commits into
base: main
Choose a base branch
from
+20 −8
Open

Add retries for token creation in tests #793

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee2d7d4
Add retries for token creation in tests
May 14, 2026
8748e81
Merge branch 'main' into retry-create-token-in-tests
vladem May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions tests/e2e-kubernetes/testsuites/credentials.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apimachinery/pkg/util/wait"
k8sretry "k8s.io/client-go/util/retry"
"k8s.io/kubernetes/pkg/kubelet/events"
"k8s.io/kubernetes/test/e2e/framework"
Expand Down Expand Up @@ -1186,17 +1187,30 @@ func waitUntilRoleIsAssumableEKS[Input any, Output any](
})
}

// Retries CreateToken for up to ~15s to handle transient API server errors
Copy link
Copy Markdown
Collaborator

@jet-tong jet-tong May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

np: found out Steps is attempt count not retry count, so 5 steps = 4 sleeps = 0.5+1+2+4 seconds. If Duration is 1s then 1+2+4+8=15 :)

// (e.g. gRPC connection closing during token signing).
func createServiceAccountToken(ctx context.Context, f *framework.Framework, sa *v1.ServiceAccount, tokenRequest *authenticationv1.TokenRequest) *authenticationv1.TokenRequest {
saClient := f.ClientSet.CoreV1().ServiceAccounts(sa.Namespace)
var serviceAccountToken *authenticationv1.TokenRequest
backoff := wait.Backoff{Steps: 5, Duration: 500 * time.Millisecond, Factor: 2.0, Jitter: 0.1}
err := k8sretry.OnError(backoff, apierrors.IsInternalError, func() error {
var err error
serviceAccountToken, err = saClient.CreateToken(ctx, sa.Name, tokenRequest, metav1.CreateOptions{})
Copy link
Copy Markdown
Collaborator

@jet-tong jet-tong May 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Non-blocking: maybe we can add framework.Logf line here so we can see how much it helps later?

return err
})
framework.ExpectNoError(err)
return serviceAccountToken
}

func waitUntilRoleIsAssumableWithWebIdentity(ctx context.Context, f *framework.Framework, sa *v1.ServiceAccount) {
roleARN := sa.Annotations[roleARNAnnotation]
framework.Logf("Waiting until IAM role %s for ServiceAccount %s is assumable with web identity", roleARN, sa.Name)

saClient := f.ClientSet.CoreV1().ServiceAccounts(sa.Namespace)
serviceAccountToken, err := saClient.CreateToken(ctx, sa.Name, &authenticationv1.TokenRequest{
serviceAccountToken := createServiceAccountToken(ctx, f, sa, &authenticationv1.TokenRequest{
Spec: authenticationv1.TokenRequestSpec{
Audiences: []string{serviceAccountTokenAudienceSTS},
},
}, metav1.CreateOptions{})
framework.ExpectNoError(err)
})

client := sts.NewFromConfig(awsConfig(ctx))
waitUntilRoleIsAssumableSTS(ctx, client.AssumeRoleWithWebIdentity, &sts.AssumeRoleWithWebIdentityInput{
Expand All @@ -1214,8 +1228,7 @@ func waitUntilRoleIsAssumableWithEKS(ctx context.Context, f *framework.Framework

framework.Logf("Waiting until IAM role for ServiceAccount %s is assumable for EKS Pod Identity (%s, %s, %s)", sa.Name, pod.Name, pod.UID, pod.Namespace)

saClient := f.ClientSet.CoreV1().ServiceAccounts(sa.Namespace)
serviceAccountToken, err := saClient.CreateToken(ctx, sa.Name, &authenticationv1.TokenRequest{
serviceAccountToken := createServiceAccountToken(ctx, f, sa, &authenticationv1.TokenRequest{
ObjectMeta: metav1.ObjectMeta{
Namespace: pod.Namespace,
},
Expand All @@ -1228,8 +1241,7 @@ func waitUntilRoleIsAssumableWithEKS(ctx context.Context, f *framework.Framework
UID: pod.UID,
},
},
}, metav1.CreateOptions{})
framework.ExpectNoError(err)
})

client := eksauth.NewFromConfig(awsConfig(ctx))
waitUntilRoleIsAssumableEKS(ctx, client.AssumeRoleForPodIdentity, &eksauth.AssumeRoleForPodIdentityInput{
Expand Down
Loading