Merge pull request #1909 from sanchezl/no-token-secrets-01

OCPBUILD-13: UPSTREAM: <carry>: fix [sig-auth] ServiceAccounts no secret-based service account token should be auto-generated

Author: openshift-merge-bot[bot]

test/e2e/auth/service_accounts.go

@@ -65,10 +65,17 @@ var _ = SIGDescribe("ServiceAccounts", func() {
 			sa, err := f.ClientSet.CoreV1().ServiceAccounts(f.Namespace.Name).Get(ctx, "default", metav1.GetOptions{})
 			framework.ExpectNoError(err)
 
-			// TODO: OpenShift creates a Secret with a prefix "default-dockercfg", is the
-			//  following assertion valid?
-			gomega.Expect(sa.Secrets).To(gomega.HaveLen(1))
-			gomega.Expect(sa.Secrets[0].Name).To(gomega.HavePrefix("default-dockercfg"))
+			// TODO: Ignore the image pull secret that OpenShift sometimes creates and adds to the list of Secrets.
+			// TODO: This patch can be removed once OpenShift stops adding the pull secret to the list of secrets in 4.16.
+			secrets := sa.DeepCopy().Secrets
+			sa.Secrets = nil
+			for _, s := range secrets {
+				if strings.HasPrefix(s.Name, "default-dockercfg") {
+					continue
+				}
+				sa.Secrets = append(sa.Secrets, s)
+			}
+			gomega.Expect(sa.Secrets).To(gomega.BeEmpty())
 		}
 	})