Merge pull request #10631 from liggitt/service_account_describer

Fix service account describer

pkg/kubectl/describe.go

@@ -753,25 +753,43 @@ func describeServiceAccount(serviceAccount *api.ServiceAccount, tokens []api.Sec
 		fmt.Fprintf(out, "Name:\t%s\n", serviceAccount.Name)
 		fmt.Fprintf(out, "Namespace:\t%s\n", serviceAccount.Namespace)
 		fmt.Fprintf(out, "Labels:\t%s\n", formatLabels(serviceAccount.Labels))
+		fmt.Fprintln(out)
 
-		if len(serviceAccount.Secrets) == 0 {
+		var (
-			fmt.Fprintf(out, "Secrets:\t<none>\n")
+			emptyHeader = "                   "
-		} else {
+			pullHeader  = "Image pull secrets:"
-			prefix := "Secrets:"
+			mountHeader = "Mountable secrets: "
-			for _, s := range serviceAccount.Secrets {
+			tokenHeader = "Tokens:            "
-				fmt.Fprintf(out, "%s\t%s\n", prefix, s)
+
-				prefix = "        "
+			pullSecretNames  = []string{}
-			}
+			mountSecretNames = []string{}
-			fmt.Fprintln(out)
+			tokenSecretNames = []string{}
+		)
+
+		for _, s := range serviceAccount.ImagePullSecrets {
+			pullSecretNames = append(pullSecretNames, s.Name)
+		}
+		for _, s := range serviceAccount.Secrets {
+			mountSecretNames = append(mountSecretNames, s.Name)
+		}
+		for _, s := range tokens {
+			tokenSecretNames = append(tokenSecretNames, s.Name)
 		}
 
-		if len(tokens) == 0 {
+		types := map[string][]string{
-			fmt.Fprintf(out, "Tokens: \t<none>\n")
+			pullHeader:  pullSecretNames,
-		} else {
+			mountHeader: mountSecretNames,
-			prefix := "Tokens: "
+			tokenHeader: tokenSecretNames,
-			for _, t := range tokens {
+		}
-				fmt.Fprintf(out, "%s\t%s\n", prefix, t.Name)
+		for header, names := range types {
-				prefix = "        "
+			if len(names) == 0 {
+				fmt.Fprintf(out, "%s\t<none>\n", header)
+			} else {
+				prefix := header
+				for _, name := range names {
+					fmt.Fprintf(out, "%s\t%s\n", prefix, name)
+					prefix = emptyHeader
+				}
 			}
 			fmt.Fprintln(out)
 		}