diff --git a/e2e/fixtures/kubernetes_fixtures.go b/e2e/fixtures/kubernetes_fixtures.go index 98cdb284b..eabad4666 100644 --- a/e2e/fixtures/kubernetes_fixtures.go +++ b/e2e/fixtures/kubernetes_fixtures.go @@ -23,7 +23,6 @@ package fixtures import ( ctx "context" "log" - "regexp" "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" @@ -32,6 +31,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) +const ( + namespaceRegEx = `^[a-z0-9]([-a-z0-9]*[a-z0-9])?$` +) + // MultipleNamespaces creates multiple namespaces for HA testing. func (factory *Factory) MultipleNamespaces(dcIDs []string) []string { res := make([]string, len(dcIDs)) @@ -64,13 +67,8 @@ func (factory *Factory) createNamespace(suffix string) string { namespace := factory.options.namespace if namespace == "" { + gomega.Expect(factory.singleton.userName).To(gomega.MatchRegexp(namespaceRegEx), "user name contains invalid characters") namespace = factory.singleton.userName + "-" + RandStringRunes(8) - matched, err := regexp.Match(`^[a-z0-9]([-a-z0-9]*[a-z0-9])?$`, []byte(namespace)) - if !matched { - return "" - } - - gomega.Expect(err).ToNot(gomega.HaveOccurred()) } if suffix != "" {