Skip to content
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.

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

fix: allow fetching long-lived token from secret #78

Merged
merged 1 commit into from
Apr 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 25 additions & 3 deletions pkg/cmd/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,47 @@ import (
"k8s.io/client-go/kubernetes"
)

func getTokenFromServiceAccountSecret(ctx context.Context, client *kubernetes.Clientset, namespace, serviceaccountName string) (string, []byte, error) {
func getTokenForServiceAccount(ctx context.Context, client *kubernetes.Clientset, namespace, serviceaccountName string) (string, []byte, error) {
serviceaccount, err := client.CoreV1().ServiceAccounts(namespace).Get(ctx, serviceaccountName, metav1.GetOptions{})
if err != nil {
return "", nil, fmt.Errorf("Failed to get serviceaccount %s/%s: %v", namespace, serviceaccountName, err)
}

if len(serviceaccount.Secrets) < 1 {
var serviceAccountSecrets []v1.ObjectReference

if len(serviceaccount.Secrets) > 0 {
serviceAccountSecrets = serviceaccount.Secrets
} else {
secrets, err := client.CoreV1().Secrets(namespace).List(ctx, metav1.ListOptions{})
if err != nil {
return "", nil, fmt.Errorf("failed to list secrets: %v", err)
}

for _, secret := range secrets.Items {
if secret.Annotations["kubernetes.io/service-account.uid"] == string(serviceaccount.UID) {
serviceAccountSecrets = append(serviceAccountSecrets, v1.ObjectReference{Name: secret.Name})
break
}
}
}

if len(serviceAccountSecrets) < 1 {
return "", nil, fmt.Errorf(`"serviceaccount %s/%s has no secrets.

In Kubernetes 1.24+, secret-based tokens are no longer auto-created
by default for new service accounts. Using bound tokens created by "kubectl
create token" command to access the Kubernetes API is recommended instead.

Alternatively, you can attach a long-lived token to the service account;
see https://kubernetes.io/docs/reference/access-authn-authz/service-accounts-admin/#create-token
for more information.

Check the help message of this command to see how to show the kubeconfig
setting with a bound token.`, namespace, serviceaccountName)
}

var secret *v1.Secret
for _, secretRef := range serviceaccount.Secrets {
for _, secretRef := range serviceAccountSecrets {
secret, err = client.CoreV1().Secrets(namespace).Get(ctx, secretRef.Name, metav1.GetOptions{})
if err != nil {
return "", nil, fmt.Errorf("Failed to get a secret: %v", err)
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/view-serviceaccount-kubeconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ func (o *ViewServiceaccountKubeconfigOptions) Run() error {
return err
}

token, caCrt, err = getTokenFromServiceAccountSecret(context.Background(), client, namespace, serviceaccountName)
token, caCrt, err = getTokenForServiceAccount(context.Background(), client, namespace, serviceaccountName)
if err != nil {
return err
}
Expand Down
Loading