Merge pull request #14051 from enj/enj/i/etcd_sa_flake/14020

Merged by openshift-bot

Author: OpenShift Bot

test/integration/etcd_storage_path_test.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/openshift/origin/pkg/api/latest"
 	serverapi "github.com/openshift/origin/pkg/cmd/server/api"
+	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 	osclientcmd "github.com/openshift/origin/pkg/cmd/util/clientcmd"
 	testutil "github.com/openshift/origin/test/util"
 	testserver "github.com/openshift/origin/test/util/server"
@@ -873,6 +874,13 @@ func testEtcdStoragePath(t *testing.T, etcdServer *etcdtest.EtcdTestServer, gett
 	if _, err := kubeClient.Core().Namespaces().Create(&kapi.Namespace{ObjectMeta: metav1.ObjectMeta{Name: testNamespace}}); err != nil {
 		t.Fatalf("error creating test namespace: %#v", err)
 	}
+	if err := testserver.WaitForServiceAccounts(
+		kubeClient,
+		testNamespace,
+		[]string{bootstrappolicy.DefaultServiceAccountName, bootstrappolicy.BuilderServiceAccountName, bootstrappolicy.DeployerServiceAccountName},
+	); err != nil {
+		t.Fatalf("error creating test namespace service accounts: %#v", err)
+	}
 
 	kindSeen := sets.NewString()
 	etcdSeen := map[schema.GroupVersionResource]empty{}