@@ -54,7 +54,12 @@ func NewCmdNewProject(name, fullName string, f *clientcmd.Factory, out io.Writer

 			if options.Client, _, err = f.Clients(); err != nil {

 				kcmdutil.CheckErr(err)

 			}

-			if err := options.Run(); err != nil {

+

+			// We can't depend on len(options.NodeSelector) > 0 as node-selector="" is valid

+			// and we want to populate node selector as project annotation only if explicitly set by user

+			useNodeSelector := cmd.Flag("node-selector").Changed

+

+			if err := options.Run(useNodeSelector); err != nil {

 				kcmdutil.CheckErr(err)

 			}

 		},

@@ -64,7 +69,7 @@ func NewCmdNewProject(name, fullName string, f *clientcmd.Factory, out io.Writer

 	cmd.Flags().StringVar(&options.AdminUser, "admin", "", "project admin username")

 	cmd.Flags().StringVar(&options.DisplayName, "display-name", "", "project display name")

 	cmd.Flags().StringVar(&options.Description, "description", "", "project description")

-	cmd.Flags().StringVar(&options.NodeSelector, "node-selector", "", "Restrict pods onto nodes matching given label selector. Format: '<key1>=<value1>, <key2>=<value2>...'")

+	cmd.Flags().StringVar(&options.NodeSelector, "node-selector", "", "Restrict pods onto nodes matching given label selector. Format: '<key1>=<value1>, <key2>=<value2>...'. Specifying \"\" means any node, not default. If unspecified, cluster default node selector will be used.")

 	return cmd

 }

@@ -78,7 +83,7 @@ func (o *NewProjectOptions) complete(args []string) error {

 	return nil

 }

-func (o *NewProjectOptions) Run() error {

+func (o *NewProjectOptions) Run(useNodeSelector bool) error {

 	if _, err := o.Client.Projects().Get(o.ProjectName); err != nil {

 		if !kerrors.IsNotFound(err) {

 			return err

@@ -92,7 +97,9 @@ func (o *NewProjectOptions) Run() error {

 	project.Annotations = make(map[string]string)

 	project.Annotations["description"] = o.Description

 	project.Annotations["displayName"] = o.DisplayName

-	project.Annotations["openshift.io/node-selector"] = o.NodeSelector

+	if useNodeSelector {

+		project.Annotations[projectapi.ProjectNodeSelectorParam] = o.NodeSelector

+	}

 	project, err := o.Client.Projects().Create(project)

 	if err != nil {

 		return err

@@ -18,10 +18,9 @@ import (

 )

 type NewProjectOptions struct {

-	ProjectName  string

-	DisplayName  string

-	Description  string

-	NodeSelector string

+	ProjectName string

+	DisplayName string

+	Description string

 	Client client.Interface

@@ -106,7 +105,6 @@ func (o *NewProjectOptions) Run() error {

 	projectRequest.DisplayName = o.DisplayName

 	projectRequest.Annotations = make(map[string]string)

 	projectRequest.Annotations["description"] = o.Description

-	projectRequest.Annotations["openshift.io/node-selector"] = o.NodeSelector

 	project, err := o.Client.ProjectRequests().Create(projectRequest)

 	if err != nil {

@@ -27,6 +27,7 @@ import (

 	buildutil "github.com/openshift/origin/pkg/build/util"

 	"github.com/openshift/origin/pkg/client"

 	imageapi "github.com/openshift/origin/pkg/image/api"

+	projectapi "github.com/openshift/origin/pkg/project/api"

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

 )

@@ -552,7 +553,7 @@ func (d *ProjectDescriber) Describe(namespace, name string) (string, error) {

 	nodeSelector := ""

 	if len(project.ObjectMeta.Annotations) > 0 {

-		if ns, ok := project.ObjectMeta.Annotations["openshift.io/node-selector"]; ok {

+		if ns, ok := project.ObjectMeta.Annotations[projectapi.ProjectNodeSelectorParam]; ok {

 			nodeSelector = ns

 		}

 	}

@@ -8,6 +8,7 @@ import (

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient"

+	projectapi "github.com/openshift/origin/pkg/project/api"

 	projectcache "github.com/openshift/origin/pkg/project/cache"

 	"github.com/openshift/origin/pkg/util/labelselector"

 )

@@ -30,28 +31,29 @@ func TestPodAdmission(t *testing.T) {

 	}

 	tests := []struct {

-		defaultNodeSelector string

-		projectNodeSelector string

-		podNodeSelector     map[string]string

-		mergedNodeSelector  map[string]string

-		admit               bool

-		testName            string

+		defaultNodeSelector       string

+		projectNodeSelector       string

+		podNodeSelector           map[string]string

+		mergedNodeSelector        map[string]string

+		ignoreProjectNodeSelector bool

+		admit                     bool

+		testName                  string

 	}{

 		{

-			defaultNodeSelector: "",

-			projectNodeSelector: "",

-			podNodeSelector:     map[string]string{},

-			mergedNodeSelector:  map[string]string{},

-			admit:               true,

-			testName:            "No node selectors",

+			defaultNodeSelector:       "",

+			podNodeSelector:           map[string]string{},

+			mergedNodeSelector:        map[string]string{},

+			ignoreProjectNodeSelector: true,

+			admit:    true,

+			testName: "No node selectors",

 		},

 		{

-			defaultNodeSelector: "infra = false",

-			projectNodeSelector: "",

-			podNodeSelector:     map[string]string{},

-			mergedNodeSelector:  map[string]string{"infra": "false"},

-			admit:               true,

-			testName:            "Default node selector and no conflicts",

+			defaultNodeSelector:       "infra = false",

+			podNodeSelector:           map[string]string{},

+			mergedNodeSelector:        map[string]string{"infra": "false"},

+			ignoreProjectNodeSelector: true,

+			admit:    true,

+			testName: "Default node selector and no conflicts",

 		},

 		{

 			defaultNodeSelector: "",

@@ -63,6 +65,14 @@ func TestPodAdmission(t *testing.T) {

 		},

 		{

 			defaultNodeSelector: "infra = false",

+			projectNodeSelector: "",

+			podNodeSelector:     map[string]string{},

+			mergedNodeSelector:  map[string]string{},

+			admit:               true,

+			testName:            "Empty project node selector and no conflicts",

+		},

+		{

+			defaultNodeSelector: "infra = false",

 			projectNodeSelector: "infra=true",

 			podNodeSelector:     map[string]string{},

 			mergedNodeSelector:  map[string]string{"infra": "true"},

@@ -96,7 +106,9 @@ func TestPodAdmission(t *testing.T) {

 	}

 	for _, test := range tests {

 		projectcache.FakeProjectCache(mockClient, projectStore, test.defaultNodeSelector)

-		project.ObjectMeta.Annotations = map[string]string{"openshift.io/node-selector": test.projectNodeSelector}

+		if !test.ignoreProjectNodeSelector {

+			project.ObjectMeta.Annotations = map[string]string{projectapi.ProjectNodeSelectorParam: test.projectNodeSelector}

+		}

 		pod.Spec = kapi.PodSpec{NodeSelector: test.podNodeSelector}

 		err := handler.Admit(admission.NewAttributesRecord(pod, "Pod", project.ObjectMeta.Name, "pods", admission.Create, nil))

@@ -11,9 +11,11 @@ type ProjectList struct {

 	Items []Project

 }

-// These are internal finalizer values to Origin

 const (

+	// These are internal finalizer values to Origin

 	FinalizerOrigin kapi.FinalizerName = "openshift.io/origin"

+

+	ProjectNodeSelectorParam string = "openshift.io/node-selector"

 )

 // ProjectSpec describes the attributes on a Project

@@ -11,9 +11,11 @@ type ProjectList struct {

 	Items         []Project `json:"items"`

 }

-// These are internal finalizer values to Origin

 const (

+	// These are internal finalizer values to Origin

 	FinalizerOrigin kapi.FinalizerName = "openshift.io/origin"

+

+	ProjectNodeSelectorParam string = "openshift.io/node-selector"

 )

 // ProjectSpec describes the attributes on a Project

@@ -11,9 +11,11 @@ type ProjectList struct {

 	Items         []Project `json:"items"`

 }

-// These are internal finalizer values to Origin

 const (

+	// These are internal finalizer values to Origin

 	FinalizerOrigin kapi.FinalizerName = "openshift.io/origin"

+

+	ProjectNodeSelectorParam string = "openshift.io/node-selector"

 )

 // ProjectSpec describes the attributes on a Project

@@ -11,9 +11,11 @@ type ProjectList struct {

 	Items         []Project `json:"items"`

 }

-// These are internal finalizer values to Origin

 const (

+	// These are internal finalizer values to Origin

 	FinalizerOrigin kapi.FinalizerName = "openshift.io/origin"

+

+	ProjectNodeSelectorParam string = "openshift.io/node-selector"

 )

 // ProjectSpec describes the attributes on a Project

@@ -59,9 +59,9 @@ func validateNodeSelector(p *api.Project) fielderrors.ValidationErrorList {

 	allErrs := fielderrors.ValidationErrorList{}

 	if len(p.Annotations) > 0 {

-		if selector, ok := p.Annotations["openshift.io/node-selector"]; ok {

+		if selector, ok := p.Annotations[api.ProjectNodeSelectorParam]; ok {

 			if _, err := labelselector.Parse(selector); err != nil {

-				allErrs = append(allErrs, fielderrors.NewFieldInvalid("nodeSelector", p.Annotations["openshift.io/node-selector"], "must be a valid label selector"))

+				allErrs = append(allErrs, fielderrors.NewFieldInvalid("nodeSelector", p.Annotations[api.ProjectNodeSelectorParam], "must be a valid label selector"))

 			}

 		}

 	}

@@ -122,7 +122,7 @@ func TestValidateProject(t *testing.T) {

 					Name:      "foo",

 					Namespace: "",

 					Annotations: map[string]string{

-						"openshift.io/node-selector": "infra=true, env = test",

+						api.ProjectNodeSelectorParam: "infra=true, env = test",

 					},

 				},

 			},

@@ -135,7 +135,7 @@ func TestValidateProject(t *testing.T) {

 					Name:      "foo",

 					Namespace: "",

 					Annotations: map[string]string{

-						"openshift.io/node-selector": "infra, env = $test",

+						api.ProjectNodeSelectorParam: "infra, env = $test",

 					},

 				},

 			},

@@ -11,6 +11,7 @@ import (

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"

+	projectapi "github.com/openshift/origin/pkg/project/api"

 	"github.com/openshift/origin/pkg/util/labelselector"

 )

@@ -51,12 +52,14 @@ func (p *ProjectCache) GetNamespaceObject(name string) (*kapi.Namespace, error)

 func (p *ProjectCache) GetNodeSelector(namespace *kapi.Namespace) string {

 	selector := ""

+	found := false

 	if len(namespace.ObjectMeta.Annotations) > 0 {

-		if ns, ok := namespace.ObjectMeta.Annotations["openshift.io/node-selector"]; ok {

+		if ns, ok := namespace.ObjectMeta.Annotations[projectapi.ProjectNodeSelectorParam]; ok {

 			selector = ns

+			found = true

 		}

 	}

-	if len(selector) == 0 {

+	if !found {

 		selector = p.DefaultNodeSelector

 	}

 	return selector

@@ -66,7 +66,7 @@ func TestLogin(t *testing.T) {

 		AdminRole:   bootstrappolicy.AdminRoleName,

 		AdminUser:   username,

 	}

-	if err := newProjectOptions.Run(); err != nil {

+	if err := newProjectOptions.Run(false); err != nil {

 		t.Fatalf("unexpected error, a project is required to continue: %v", err)

 	}

@@ -131,8 +131,8 @@ func TestProjectIsNamespace(t *testing.T) {

 		ObjectMeta: kapi.ObjectMeta{

 			Name: "new-project",

 			Annotations: map[string]string{

-				"displayName":                "Hello World",

-				"openshift.io/node-selector": "env=test",

+				"displayName":                       "Hello World",

+				projectapi.ProjectNodeSelectorParam: "env=test",

 			},

 		},

 	}

@@ -152,8 +152,8 @@ func TestProjectIsNamespace(t *testing.T) {

 	if project.Annotations["displayName"] != namespace.Annotations["displayName"] {

 		t.Fatalf("Project display name did not match namespace annotation, project %v, namespace %v", project.Annotations["displayName"], namespace.Annotations["displayName"])

 	}

-	if project.Annotations["openshift.io/node-selector"] != namespace.Annotations["openshift.io/node-selector"] {

-		t.Fatalf("Project node selector did not match namespace node selector, project %v, namespace %v", project.Annotations["openshift.io/node-selector"], namespace.Annotations["openshift.io/node-selector"])

+	if project.Annotations[projectapi.ProjectNodeSelectorParam] != namespace.Annotations[projectapi.ProjectNodeSelectorParam] {

+		t.Fatalf("Project node selector did not match namespace node selector, project %v, namespace %v", project.Annotations[projectapi.ProjectNodeSelectorParam], namespace.Annotations[projectapi.ProjectNodeSelectorParam])

 	}

 }

@@ -341,7 +341,7 @@ func CreateNewProject(clusterAdminClient *client.Client, clientConfig kclient.Co

 		AdminUser:   adminUser,

 	}

-	if err := newProjectOptions.Run(); err != nil {

+	if err := newProjectOptions.Run(false); err != nil {

 		return nil, err

 	}