@@ -2,49 +2,52 @@ package validation

 import (

 	"regexp"

+	"strings"

 	kubeapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

-	. "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"

-	. "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation"

-	. "github.com/openshift/origin/pkg/template/api"

 	routeapi "github.com/openshift/origin/pkg/route/api"

-	. "github.com/openshift/origin/pkg/route/api/validation"

+	routevalidation "github.com/openshift/origin/pkg/route/api/validation"

+	"github.com/openshift/origin/pkg/template/api"

 )

 var parameterNameExp = regexp.MustCompile(`^[a-zA-Z0-9\_]+$`)

 // ValidateParameter tests if required fields in the Parameter are set.

-func ValidateParameter(param *Parameter) (errs ErrorList) {

+func ValidateParameter(param *api.Parameter) (errs errors.ErrorList) {

 	if len(param.Name) == 0 {

-		errs = append(errs, NewFieldRequired("name", ""))

+		errs = append(errs, errors.NewFieldRequired("name", ""))

 		return

 	}

 	if !parameterNameExp.MatchString(param.Name) {

-		errs = append(errs, NewFieldInvalid("name", param.Name))

+		errs = append(errs, errors.NewFieldInvalid("name", param.Name))

 	}

 	return

 }

 // ValidateTemplate tests if required fields in the Template are set.

-func ValidateTemplate(template *Template) (errs ErrorList) {

+func ValidateTemplate(template *api.Template) (errs errors.ErrorList) {

 	if len(template.ID) == 0 {

-		errs = append(errs, NewFieldRequired("id", template.ID))

+		errs = append(errs, errors.NewFieldRequired("id", template.ID))

 	}

 	for i, item := range template.Items {

-		err := ErrorList{}

+		err := errors.ErrorList{}

 		switch obj := item.Object.(type) {

 		case *kubeapi.ReplicationController:

-			err = ValidateReplicationController(obj)

+			err = validation.ValidateReplicationController(obj)

 		case *kubeapi.Pod:

-			err = ValidatePod(obj)

+			err = validation.ValidatePod(obj)

 		case *kubeapi.Service:

-			err = ValidateService(obj)

-                case *routeapi.Route:

-                        err = ValidateRoute(obj)

+			err = validation.ValidateService(obj)

+		case *routeapi.Route:

+			err = routevalidation.ValidateRoute(obj)

 		default:

 			// Pass-through unknown types.

 		}

+		// ignore namespace validation errors in templates

+		err = filter(err, "namespace")

 		errs = append(errs, err.PrefixIndex(i).Prefix("items")...)

 	}

 	for i := range template.Parameters {

@@ -53,3 +56,18 @@ func ValidateTemplate(template *Template) (errs ErrorList) {

 	}

 	return

 }

+

+func filter(errs errors.ErrorList, prefix string) errors.ErrorList {

+	if errs == nil {

+		return errs

+	}

+	next := errors.ErrorList{}

+	for _, err := range errs {

+		ve, ok := err.(errors.ValidationError)

+		if ok && strings.HasPrefix(ve.Field, prefix) {

+			continue

+		}

+		next = append(next, err)

+	}

+	return next

+}