Skip to content

Commit a1ea54b

Browse files
authored
Support default serviceAccount (deckhouse#49)
1 parent 5a366a1 commit a1ea54b

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

pkg/registry_checker/indexers.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,14 @@ func ExtractPullSecretRefs(kubeClient *kubernetes.Clientset, obj interface{}) (r
158158
// Image pull secret defined in Pod's `spec.ImagePullSecrets` takes preference over the secret from ServiceAccount.
159159
// We are acting the same way as kubelet does:
160160
// https://github.com/kubernetes/kubernetes/blob/88b31814f4a55c0af1c7d2712ce736a8fe08887e/plugin/pkg/admission/serviceaccount/admission.go#L163-L168.
161-
if len(pullSecretRefs) == 0 && len(podSpec.ServiceAccountName) > 0 {
162-
serviceAccount, err := kubeClient.CoreV1().ServiceAccounts(namespace).Get(context.TODO(), podSpec.ServiceAccountName, metav1.GetOptions{})
161+
if len(pullSecretRefs) == 0 {
162+
var serviceAccountName string
163+
if len(podSpec.ServiceAccountName) > 0 {
164+
serviceAccountName = podSpec.ServiceAccountName
165+
} else {
166+
serviceAccountName = "default"
167+
}
168+
serviceAccount, err := kubeClient.CoreV1().ServiceAccounts(namespace).Get(context.TODO(), serviceAccountName, metav1.GetOptions{})
163169
if err == nil {
164170
pullSecretRefs = append(pullSecretRefs, extractPullSecretRefsFromServiceAccount(namespace, *serviceAccount)...)
165171
}

0 commit comments

Comments
 (0)