github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-05-16 14:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed can't get sa token secret when secret name is long (#197)

Browse Source 
Signed-off-by: xuezhaojun <zxue@redhat.com>
This commit is contained in:
xuezhaojun
2022-01-28 15:24:01 +08:00
committed by GitHub
parent 2c2316fafa
commit e697e47989
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/helpers/sa_syncer.go
View File

@@ -3,7 +3,6 @@ package helpers
import (
"context"
"fmt"
"strings"
"github.com/openshift/library-go/pkg/operator/events"
"github.com/openshift/library-go/pkg/operator/resource/resourceapply"
@@ -38,32 +37,25 @@ func EnsureSAToken(ctx context.Context, saName, saNamespace string, client kuber
return fmt.Errorf("token secret for %s not exist yet", saName)
}
prefix := saName
if len(prefix) > 63 {
prefix = prefix[:37]
}
for _, secret := range sa.Secrets {
if strings.HasPrefix(secret.Name, prefix) && strings.Contains(secret.Name, "token") {
tokenSecretName := secret.Name
// get the token secret
tokenSecretName := secret.Name
// get the token secret
tokenSecret, err := client.CoreV1().Secrets(saNamespace).Get(ctx, tokenSecretName, metav1.GetOptions{})
if err != nil {
return err
}
if tokenSecret.Type != corev1.SecretTypeServiceAccountToken {
continue
}
saToken, ok := tokenSecret.Data["token"]
if !ok {
return fmt.Errorf("no token in data for secret %s", tokenSecretName)
}
return renderSAToken(saToken)
tokenSecret, err := client.CoreV1().Secrets(saNamespace).Get(ctx, tokenSecretName, metav1.GetOptions{})
if err != nil {
return err
}
if tokenSecret.Type != corev1.SecretTypeServiceAccountToken {
continue
}
saToken, ok := tokenSecret.Data["token"]
if !ok {
return fmt.Errorf("no token in data for secret %s", tokenSecretName)
}
return renderSAToken(saToken)
}
return fmt.Errorf("no token secret for this service account %s", sa.Name)