From 7057d399bc618096db4c8c34600a53e3bd2e247f Mon Sep 17 00:00:00 2001 From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com> Date: Thu, 13 Jun 2024 07:23:36 +0200 Subject: [PATCH] Fix: Naming convention --- k8-operator/packages/util/auth.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/k8-operator/packages/util/auth.go b/k8-operator/packages/util/auth.go index 93569b31f..d3ee0ce3b 100644 --- a/k8-operator/packages/util/auth.go +++ b/k8-operator/packages/util/auth.go @@ -9,21 +9,18 @@ import ( ) func GetServiceAccountToken(k8sClient client.Client, namespace string, serviceAccountName string) (string, error) { - if namespace == "" { - namespace = "default" - } - sa := &corev1.ServiceAccount{} - err := k8sClient.Get(context.TODO(), client.ObjectKey{Name: serviceAccountName, Namespace: namespace}, sa) + serviceAccount := &corev1.ServiceAccount{} + err := k8sClient.Get(context.TODO(), client.ObjectKey{Name: serviceAccountName, Namespace: namespace}, serviceAccount) if err != nil { return "", err } - if len(sa.Secrets) == 0 { + if len(serviceAccount.Secrets) == 0 { return "", fmt.Errorf("no secrets found for service account %s", serviceAccountName) } - secretName := sa.Secrets[0].Name + secretName := serviceAccount.Secrets[0].Name secret := &corev1.Secret{} err = k8sClient.Get(context.TODO(), client.ObjectKey{Name: secretName, Namespace: namespace}, secret)