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

 const NewProjectRecommendedName = "new-project"

 type NewProjectOptions struct {

-	ProjectName  string

-	DisplayName  string

-	Description  string

-	NodeSelector string

+	ProjectName string

+	DisplayName string

+	Description string

 	Client client.Interface

@@ -60,7 +59,6 @@ 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")

 	return cmd

 }

@@ -88,7 +86,6 @@ func (o *NewProjectOptions) Run() error {

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

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

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

-	project.Annotations["nodeSelector"] = 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

@@ -41,8 +40,8 @@ After your project is created you can switch to it using %[2]s <project name>.`

 	requestProject_example = `  // Create a new project with minimal information

   $ %[1]s web-team-dev

-  // Create a new project with a description and node selector

-  $ %[1]s web-team-dev --display-name="Web Team Development" --description="Development project for the web team." --node-selector="env=dev"`

+  // Create a new project with a description

+  $ %[1]s web-team-dev --display-name="Web Team Development" --description="Development project for the web team."`

 )

 func NewCmdRequestProject(name, fullName, oscLoginName, oscProjectName string, f *clientcmd.Factory, out io.Writer) *cobra.Command {

@@ -50,7 +49,7 @@ func NewCmdRequestProject(name, fullName, oscLoginName, oscProjectName string, f

 	options.Out = out

 	cmd := &cobra.Command{

-		Use:     fmt.Sprintf("%s NAME [--display-name=DISPLAYNAME] [--description=DESCRIPTION] [--node-selector=<label selector>]", name),

+		Use:     fmt.Sprintf("%s NAME [--display-name=DISPLAYNAME] [--description=DESCRIPTION]", name),

 		Short:   "Request a new project",

 		Long:    fmt.Sprintf(requestProject_long, oscLoginName, oscProjectName),

 		Example: fmt.Sprintf(requestProject_example, fullName),

@@ -72,7 +71,6 @@ func NewCmdRequestProject(name, fullName, oscLoginName, oscProjectName string, f

 	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")

 	return cmd

 }

@@ -107,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["nodeSelector"] = o.NodeSelector

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

 	if err != nil {

@@ -451,18 +451,11 @@ func (d *ProjectDescriber) Describe(namespace, name string) (string, error) {

 	if err != nil {

 		return "", err

 	}

-	nodeSelector := ""

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

-		if ns, ok := project.ObjectMeta.Annotations["nodeSelector"]; ok {

-			nodeSelector = ns

-		}

-	}

 	return tabbedString(func(out *tabwriter.Writer) error {

 		formatMeta(out, project.ObjectMeta)

 		formatString(out, "Display Name", project.Annotations["displayName"])

 		formatString(out, "Status", project.Status.Phase)

-		formatString(out, "Node Selector", nodeSelector)

 		return nil

 	})

 }

@@ -89,8 +89,6 @@ func GetMasterFileReferences(config *MasterConfig) []*string {

 	refs = append(refs, &config.PolicyConfig.BootstrapPolicyFile)

-	refs = append(refs, &config.ProjectNodeSelector)

-

 	return refs

 }

@@ -85,8 +85,6 @@ type MasterConfig struct {

 	// PolicyConfig holds information about where to locate critical pieces of bootstrapping policy

 	PolicyConfig PolicyConfig

-	// ProjectNodeSelector holds default project node label selector

-	ProjectNodeSelector string `json:"projectNodeSelector,omitempty"`

 	// ProjectRequestConfig holds information about how to handle new project requests

 	ProjectRequestConfig ProjectRequestConfig

 }

@@ -81,8 +81,6 @@ type MasterConfig struct {

 	PolicyConfig PolicyConfig `json:"policyConfig"`

-	// ProjectNodeSelector holds default project node label selector

-	ProjectNodeSelector string `json:"projectNodeSelector,omitempty"`

 	// ProjectRequestConfig holds information about how to handle new project requests

 	ProjectRequestConfig ProjectRequestConfig `json:"projectRequestConfig"`

 }

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

 	"net/url"

 	"strings"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors"

 	"github.com/openshift/origin/pkg/cmd/server/api"

@@ -89,8 +88,6 @@ func ValidateMasterConfig(config *api.MasterConfig) fielderrors.ValidationErrorL

 		allErrs = append(allErrs, ValidateOAuthConfig(config.OAuthConfig).Prefix("oauthConfig")...)

 	}

-	allErrs = append(allErrs, ValidateProjectNodeSelector(config.ProjectNodeSelector)...)

-

 	allErrs = append(allErrs, ValidateServingInfo(config.ServingInfo).Prefix("servingInfo")...)

 	allErrs = append(allErrs, ValidateProjectRequestConfig(config.ProjectRequestConfig).Prefix("projectRequestConfig")...)

@@ -111,19 +108,6 @@ func ValidateEtcdStorageConfig(config api.EtcdStorageConfig) fielderrors.Validat

 	return allErrs

 }

-func ValidateProjectNodeSelector(nodeSelector string) fielderrors.ValidationErrorList {

-	allErrs := fielderrors.ValidationErrorList{}

-

-	if len(nodeSelector) > 0 {

-		_, err := labels.Parse(nodeSelector)

-		if err != nil {

-			allErrs = append(allErrs, fielderrors.NewFieldInvalid("projectNodeSelector", nodeSelector, "must be a valid label selector"))

-		}

-	}

-

-	return allErrs

-}

-

 func ValidateAssetConfig(config *api.AssetConfig) fielderrors.ValidationErrorList {

 	allErrs := fielderrors.ValidationErrorList{}

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

 	"github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/factory"

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

-	originscheduler "github.com/openshift/origin/pkg/scheduler"

 )

 const (

@@ -172,5 +171,5 @@ func (c *MasterConfig) createSchedulerConfig() (*scheduler.Config, error) {

 	}

 	// if the config file isn't provided, use the default provider

-	return configFactory.CreateFromProvider(originscheduler.DefaultProvider)

+	return configFactory.CreateFromProvider(factory.DefaultProvider)

 }

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

 	clientetcd "github.com/openshift/origin/pkg/oauth/registry/oauthclient/etcd"

 	clientauthetcd "github.com/openshift/origin/pkg/oauth/registry/oauthclientauthorization/etcd"

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

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

 	projectcontroller "github.com/openshift/origin/pkg/project/controller"

 	projectproxy "github.com/openshift/origin/pkg/project/registry/project/proxy"

 	projectrequeststorage "github.com/openshift/origin/pkg/project/registry/projectrequest/delegated"

@@ -756,12 +755,6 @@ func (c *MasterConfig) RunDNSServer() {

 	glog.Infof("OpenShift DNS listening at %s", c.Options.DNSConfig.BindAddress)

 }

-// RunProjectCache populates project cache, used by scheduler and project admission controller.

-func (c *MasterConfig) RunProjectCache() {

-	glog.Infof("Using default project node label selector: %s", c.Options.ProjectNodeSelector)

-	projectcache.RunProjectCache(c.PrivilegedLoopbackKubernetesClient, c.Options.ProjectNodeSelector)

-}

-

 // RunBuildController starts the build sync loop for builds and buildConfig processing.

 func (c *MasterConfig) RunBuildController() {

 	// initialize build controller

@@ -47,7 +47,6 @@ type MasterArgs struct {

 	KubeConnectionArgs *KubeConnectionArgs

 	SchedulerConfigFile string

-	ProjectNodeSelector string

 }

 // BindMasterArgs binds the options to the flags with prefix + default flag names

@@ -61,7 +60,6 @@ func BindMasterArgs(args *MasterArgs, flags *pflag.FlagSet, prefix string) {

 	flags.Var(&args.NodeList, prefix+"nodes", "The hostnames of each node. This currently must be specified up front. Comma delimited list")

 	flags.Var(&args.CORSAllowedOrigins, prefix+"cors-allowed-origins", "List of allowed origins for CORS, comma separated.  An allowed origin can be a regular expression to support subdomain matching.  CORS is enabled for localhost, 127.0.0.1, and the asset server by default.")

-	flags.StringVar(&args.ProjectNodeSelector, prefix+"project-node-selector", "", "Default node label selector for the project if not explicitly specified.")

 }

 // NewDefaultMasterArgs creates MasterArgs with sub-objects created and default values set.

@@ -200,10 +198,6 @@ func (args MasterArgs) BuildSerializeableMasterConfig() (*configapi.MasterConfig

 		},

 	}

-	if len(args.ProjectNodeSelector) > 0 {

-		config.ProjectNodeSelector = args.ProjectNodeSelector

-	}

-

 	if args.ListenArg.UseTLS() {

 		config.ServingInfo.ServerCert = admin.DefaultMasterServingCertInfo(args.ConfigDir.Value())

 		config.ServingInfo.ClientCA = admin.DefaultAPIClientCAFile(args.ConfigDir.Value())

@@ -8,8 +8,5 @@ import (

 	_ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/namespace/exists"

 	_ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/namespace/lifecycle"

 	_ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/resourcequota"

-	_ "github.com/openshift/origin/pkg/project/admission/lifecycle"

-

-	// Scheduler plugins used by OpenShift

-	_ "github.com/openshift/origin/pkg/scheduler/algorithmprovider/defaults"

+	_ "github.com/openshift/origin/pkg/project/admission"

 )

@@ -308,9 +308,8 @@ func StartMaster(openshiftMasterConfig *configapi.MasterConfig) error {

 	if err != nil {

 		return err

 	}

-	// Must start policy caching immediately

+	//	 must start policy caching immediately

 	openshiftConfig.RunPolicyCache()

-	openshiftConfig.RunProjectCache()

 	unprotectedInstallers := []origin.APIInstaller{}

new file mode 100644

@@ -0,0 +1,131 @@

+/*

+Copyright 2014 Google Inc. All rights reserved.

+

+Licensed under the Apache License, Version 2.0 (the "License");

+you may not use this file except in compliance with the License.

+You may obtain a copy of the License at

+

+    http://www.apache.org/licenses/LICENSE-2.0

+

+Unless required by applicable law or agreed to in writing, software

+distributed under the License is distributed on an "AS IS" BASIS,

+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+See the License for the specific language governing permissions and

+limitations under the License.

+*/

+

+package admission

+

+import (

+	"fmt"

+	"io"

+

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/admission"

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

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

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

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

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

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"

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

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

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

+)

+

+// TODO: modify the upstream plug-in so this can be collapsed

+// need ability to specify a RESTMapper on upstream version

+func init() {

+	admission.RegisterPlugin("OriginNamespaceLifecycle", func(client client.Interface, config io.Reader) (admission.Interface, error) {

+		return NewLifecycle(client), nil

+	})

+}

+

+type lifecycle struct {

+	client client.Interface

+	store  cache.Store

+}

+

+// Admit enforces that a namespace must exist in order to associate content with it.

+// Admit enforces that a namespace that is terminating cannot accept new content being associated with it.

+func (e *lifecycle) Admit(a admission.Attributes) (err error) {

+	defaultVersion, kind, err := latest.RESTMapper.VersionAndKindForResource(a.GetResource())

+	if err != nil {

+		return err

+	}

+	mapping, err := latest.RESTMapper.RESTMapping(kind, defaultVersion)

+	if err != nil {

+		return err

+	}

+	if mapping.Scope.Name() != meta.RESTScopeNameNamespace {

+		return nil

+	}

+

+	// we want to allow someone to delete something in case it was phantom created somehow

+	if a.GetOperation() == "DELETE" {

+		return nil

+	}

+

+	// check for namespace in the cache

+	namespaceObj, exists, err := e.store.Get(&kapi.Namespace{

+		ObjectMeta: kapi.ObjectMeta{

+			Name:      a.GetNamespace(),

+			Namespace: "",

+		},

+		Status: kapi.NamespaceStatus{},

+	})

+

+	if err != nil {

+		return err

+	}

+

+	name := "Unknown"

+	obj := a.GetObject()

+	if obj != nil {

+		name, _ = meta.NewAccessor().Name(obj)

+	}

+

+	var namespace *kapi.Namespace

+	if exists {

+		namespace = namespaceObj.(*kapi.Namespace)

+	} else {

+		// Our watch maybe latent, so we make a best effort to get the object, and only fail if not found

+		namespace, err = e.client.Namespaces().Get(a.GetNamespace())

+		// the namespace does not exist, so prevent create and update in that namespace

+		if err != nil {

+			return apierrors.NewForbidden(kind, name, fmt.Errorf("Namespace %s does not exist", a.GetNamespace()))

+		}

+	}

+

+	if a.GetOperation() != "CREATE" {

+		return nil

+	}

+

+	if namespace.Status.Phase != kapi.NamespaceTerminating {

+		return nil

+	}

+

+	return apierrors.NewForbidden(kind, name, fmt.Errorf("Namespace %s is terminating", a.GetNamespace()))

+}

+

+func NewLifecycle(c client.Interface) admission.Interface {

+	store := cache.NewStore(cache.MetaNamespaceKeyFunc)

+	reflector := cache.NewReflector(

+		&cache.ListWatch{

+			ListFunc: func() (runtime.Object, error) {

+				return c.Namespaces().List(labels.Everything(), fields.Everything())

+			},

+			WatchFunc: func(resourceVersion string) (watch.Interface, error) {

+				return c.Namespaces().Watch(labels.Everything(), fields.Everything(), resourceVersion)

+			},

+		},

+		&kapi.Namespace{},

+		store,

+		0,

+	)

+	reflector.Run()

+	return &lifecycle{

+		client: c,

+		store:  store,

+	}

+}

new file mode 100644

@@ -0,0 +1,116 @@

+package admission

+

+import (

+	"fmt"

+	"testing"

+

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/admission"

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

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

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

+

+	buildapi "github.com/openshift/origin/pkg/build/api"

+)

+

+// TestAdmissionExists verifies you cannot create Origin content if namespace is not known

+func TestAdmissionExists(t *testing.T) {

+	store := cache.NewStore(cache.MetaNamespaceKeyFunc)

+	mockClient := &testclient.Fake{

+		Err: fmt.Errorf("DOES NOT EXIST"),

+	}

+	handler := &lifecycle{

+		client: mockClient,

+		store:  store,

+	}

+	build := &buildapi.Build{

+		ObjectMeta: kapi.ObjectMeta{Name: "buildid"},

+		Parameters: buildapi.BuildParameters{

+			Source: buildapi.BuildSource{

+				Type: buildapi.BuildSourceGit,

+				Git: &buildapi.GitBuildSource{

+					URI: "http://github.com/my/repository",

+				},

+				ContextDir: "context",

+			},

+			Strategy: buildapi.BuildStrategy{

+				Type:           buildapi.DockerBuildStrategyType,

+				DockerStrategy: &buildapi.DockerBuildStrategy{},

+			},

+			Output: buildapi.BuildOutput{

+				DockerImageReference: "repository/data",

+			},

+		},

+		Status: buildapi.BuildStatusNew,

+	}

+	err := handler.Admit(admission.NewAttributesRecord(build, "bogus-ns", "builds", "CREATE"))

+	if err == nil {

+		t.Errorf("Expected an error because namespace does not exist")

+	}

+}

+

+// TestAdmissionLifecycle verifies you cannot create Origin content if namespace is terminating

+func TestAdmissionLifecycle(t *testing.T) {

+	namespaceObj := &kapi.Namespace{

+		ObjectMeta: kapi.ObjectMeta{

+			Name:      "test",

+			Namespace: "",

+		},

+		Status: kapi.NamespaceStatus{

+			Phase: kapi.NamespaceActive,

+		},

+	}

+	store := cache.NewStore(cache.MetaNamespaceIndexFunc)

+	store.Add(namespaceObj)

+	mockClient := &testclient.Fake{}

+	handler := &lifecycle{

+		client: mockClient,

+		store:  store,

+	}

+	build := &buildapi.Build{

+		ObjectMeta: kapi.ObjectMeta{Name: "buildid"},

+		Parameters: buildapi.BuildParameters{

+			Source: buildapi.BuildSource{

+				Type: buildapi.BuildSourceGit,

+				Git: &buildapi.GitBuildSource{

+					URI: "http://github.com/my/repository",

+				},

+				ContextDir: "context",

+			},

+			Strategy: buildapi.BuildStrategy{

+				Type:           buildapi.DockerBuildStrategyType,

+				DockerStrategy: &buildapi.DockerBuildStrategy{},

+			},

+			Output: buildapi.BuildOutput{

+				DockerImageReference: "repository/data",

+			},

+		},

+		Status: buildapi.BuildStatusNew,

+	}

+	err := handler.Admit(admission.NewAttributesRecord(build, namespaceObj.Namespace, "builds", "CREATE"))

+	if err != nil {

+		t.Errorf("Unexpected error returned from admission handler: %v", err)

+	}

+

+	// change namespace state to terminating

+	namespaceObj.Status.Phase = kapi.NamespaceTerminating

+	store.Add(namespaceObj)

+

+	// verify create operations in the namespace cause an error

+	err = handler.Admit(admission.NewAttributesRecord(build, namespaceObj.Namespace, "builds", "CREATE"))

+	if err == nil {

+		t.Errorf("Expected error rejecting creates in a namespace when it is terminating")

+	}

+

+	// verify update operations in the namespace can proceed

+	err = handler.Admit(admission.NewAttributesRecord(build, namespaceObj.Namespace, "builds", "UPDATE"))

+	if err != nil {

+		t.Errorf("Unexpected error returned from admission handler: %v", err)

+	}

+

+	// verify delete operations in the namespace can proceed

+	err = handler.Admit(admission.NewAttributesRecord(nil, namespaceObj.Namespace, "builds", "DELETE"))

+	if err != nil {

+		t.Errorf("Unexpected error returned from admission handler: %v", err)

+	}

+

+}

deleted file mode 100644

@@ -1,92 +0,0 @@

-/*

-Copyright 2014 Google Inc. All rights reserved.

-

-Licensed under the Apache License, Version 2.0 (the "License");

-you may not use this file except in compliance with the License.

-You may obtain a copy of the License at

-

-    http://www.apache.org/licenses/LICENSE-2.0

-

-Unless required by applicable law or agreed to in writing, software

-distributed under the License is distributed on an "AS IS" BASIS,

-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-See the License for the specific language governing permissions and

-limitations under the License.

-*/

-

-package admission

-

-import (

-	"fmt"

-	"io"

-

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/admission"

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

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

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

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

-

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

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

-)

-

-// TODO: modify the upstream plug-in so this can be collapsed

-// need ability to specify a RESTMapper on upstream version

-func init() {

-	admission.RegisterPlugin("OriginNamespaceLifecycle", func(client client.Interface, config io.Reader) (admission.Interface, error) {

-		return NewLifecycle()

-	})

-}

-

-type lifecycle struct {

-}

-

-// Admit enforces that a namespace must exist in order to associate content with it.

-// Admit enforces that a namespace that is terminating cannot accept new content being associated with it.

-func (e *lifecycle) Admit(a admission.Attributes) (err error) {

-	defaultVersion, kind, err := latest.RESTMapper.VersionAndKindForResource(a.GetResource())

-	if err != nil {

-		return err

-	}

-	mapping, err := latest.RESTMapper.RESTMapping(kind, defaultVersion)

-	if err != nil {

-		return err

-	}

-	if mapping.Scope.Name() != meta.RESTScopeNameNamespace {

-		return nil

-	}

-

-	// we want to allow someone to delete something in case it was phantom created somehow

-	if a.GetOperation() == "DELETE" {

-		return nil

-	}

-

-	name := "Unknown"

-	obj := a.GetObject()

-	if obj != nil {

-		name, _ = meta.NewAccessor().Name(obj)

-	}

-

-	projects, err := cache.GetProjectCache()

-	if err != nil {

-		return err

-	}

-	namespace, err := projects.GetNamespaceObject(a.GetNamespace())

-	if err != nil {

-		return apierrors.NewForbidden(kind, name, err)

-	}

-

-	if a.GetOperation() != "CREATE" {

-		return nil

-	}

-

-	if namespace.Status.Phase != kapi.NamespaceTerminating {

-		return nil

-	}

-

-	return apierrors.NewForbidden(kind, name, fmt.Errorf("Namespace %s is terminating", a.GetNamespace()))

-}

-

-func NewLifecycle() (admission.Interface, error) {

-	return &lifecycle{}, nil

-}

deleted file mode 100644

@@ -1,112 +0,0 @@

-package admission

-

-import (

-	"fmt"

-	"testing"

-

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/admission"

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

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

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

-

-	buildapi "github.com/openshift/origin/pkg/build/api"

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

-)

-

-// TestAdmissionExists verifies you cannot create Origin content if namespace is not known

-func TestAdmissionExists(t *testing.T) {

-	mockClient := &testclient.Fake{

-		Err: fmt.Errorf("DOES NOT EXIST"),

-	}

-	projectcache.FakeProjectCache(mockClient, cache.NewStore(cache.MetaNamespaceKeyFunc), "")

-	handler := &lifecycle{}

-	build := &buildapi.Build{

-		ObjectMeta: kapi.ObjectMeta{Name: "buildid"},

-		Parameters: buildapi.BuildParameters{

-			Source: buildapi.BuildSource{

-				Type: buildapi.BuildSourceGit,

-				Git: &buildapi.GitBuildSource{

-					URI: "http://github.com/my/repository",

-				},

-				ContextDir: "context",

-			},

-			Strategy: buildapi.BuildStrategy{

-				Type:           buildapi.DockerBuildStrategyType,

-				DockerStrategy: &buildapi.DockerBuildStrategy{},

-			},

-			Output: buildapi.BuildOutput{

-				DockerImageReference: "repository/data",

-			},

-		},

-		Status: buildapi.BuildStatusNew,

-	}

-	err := handler.Admit(admission.NewAttributesRecord(build, "bogus-ns", "builds", "CREATE"))

-	if err == nil {

-		t.Errorf("Expected an error because namespace does not exist")

-	}

-}

-

-// TestAdmissionLifecycle verifies you cannot create Origin content if namespace is terminating

-func TestAdmissionLifecycle(t *testing.T) {

-	namespaceObj := &kapi.Namespace{

-		ObjectMeta: kapi.ObjectMeta{

-			Name:      "test",

-			Namespace: "",

-		},

-		Status: kapi.NamespaceStatus{

-			Phase: kapi.NamespaceActive,

-		},

-	}

-	store := cache.NewStore(cache.MetaNamespaceIndexFunc)

-	store.Add(namespaceObj)

-	mockClient := &testclient.Fake{}

-	projectcache.FakeProjectCache(mockClient, store, "")

-	handler := &lifecycle{}

-	build := &buildapi.Build{

-		ObjectMeta: kapi.ObjectMeta{Name: "buildid"},

-		Parameters: buildapi.BuildParameters{

-			Source: buildapi.BuildSource{

-				Type: buildapi.BuildSourceGit,

-				Git: &buildapi.GitBuildSource{

-					URI: "http://github.com/my/repository",

-				},

-				ContextDir: "context",

-			},

-			Strategy: buildapi.BuildStrategy{

-				Type:           buildapi.DockerBuildStrategyType,

-				DockerStrategy: &buildapi.DockerBuildStrategy{},

-			},

-			Output: buildapi.BuildOutput{

-				DockerImageReference: "repository/data",

-			},

-		},

-		Status: buildapi.BuildStatusNew,

-	}

-	err := handler.Admit(admission.NewAttributesRecord(build, namespaceObj.Namespace, "builds", "CREATE"))

-	if err != nil {

-		t.Errorf("Unexpected error returned from admission handler: %v", err)

-	}

-

-	// change namespace state to terminating

-	namespaceObj.Status.Phase = kapi.NamespaceTerminating

-	store.Add(namespaceObj)

-

-	// verify create operations in the namespace cause an error

-	err = handler.Admit(admission.NewAttributesRecord(build, namespaceObj.Namespace, "builds", "CREATE"))

-	if err == nil {

-		t.Errorf("Expected error rejecting creates in a namespace when it is terminating")

-	}

-

-	// verify update operations in the namespace can proceed

-	err = handler.Admit(admission.NewAttributesRecord(build, namespaceObj.Namespace, "builds", "UPDATE"))

-	if err != nil {

-		t.Errorf("Unexpected error returned from admission handler: %v", err)

-	}

-

-	// verify delete operations in the namespace can proceed

-	err = handler.Admit(admission.NewAttributesRecord(nil, namespaceObj.Namespace, "builds", "DELETE"))

-	if err != nil {

-		t.Errorf("Unexpected error returned from admission handler: %v", err)

-	}

-

-}

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

 	"strings"

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

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"

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

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors"

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

@@ -24,7 +23,6 @@ func ValidateProject(project *api.Project) fielderrors.ValidationErrorList {

 	if !validateNoNewLineOrTab(project.Annotations["displayName"]) {

 		result = append(result, fielderrors.NewFieldInvalid("displayName", project.Annotations["displayName"], "may not contain a new line or tab"))

 	}

-	result = append(result, validateNodeSelector(project)...)

 	return result

 }

@@ -37,7 +35,6 @@ func validateNoNewLineOrTab(s string) bool {

 func ValidateProjectUpdate(newProject *api.Project, oldProject *api.Project) fielderrors.ValidationErrorList {

 	allErrs := fielderrors.ValidationErrorList{}

 	allErrs = append(allErrs, kvalidation.ValidateObjectMetaUpdate(&oldProject.ObjectMeta, &newProject.ObjectMeta).Prefix("metadata")...)

-	allErrs = append(allErrs, validateNodeSelector(newProject)...)

 	newProject.Spec.Finalizers = oldProject.Spec.Finalizers

 	newProject.Status = oldProject.Status

 	return allErrs

@@ -49,16 +46,3 @@ func ValidateProjectRequest(request *api.ProjectRequest) fielderrors.ValidationE

 	return ValidateProject(project)

 }

-

-func validateNodeSelector(p *api.Project) fielderrors.ValidationErrorList {

-	allErrs := fielderrors.ValidationErrorList{}

-

-	if len(p.Annotations) > 0 {

-		if selector, ok := p.Annotations["nodeSelector"]; ok {

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

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

-			}

-		}

-	}

-	return allErrs

-}

@@ -97,33 +97,6 @@ func TestValidateProject(t *testing.T) {

 			// Should fail because the display name has \t \n

 			numErrs: 1,

 		},

-		{

-			name: "valid node selector",

-			project: api.Project{

-				ObjectMeta: kapi.ObjectMeta{

-					Name:      "foo",

-					Namespace: "",

-					Annotations: map[string]string{

-						"nodeSelector": "infra=true, env in (prod, qa)",

-					},

-				},

-			},

-			numErrs: 0,

-		},

-		{

-			name: "invalid node selector",

-			project: api.Project{

-				ObjectMeta: kapi.ObjectMeta{

-					Name:      "foo",

-					Namespace: "",

-					Annotations: map[string]string{

-						"nodeSelector": "infra:true,env",

-					},

-				},

-			},

-			// Should fail because infra:true is invalid format

-			numErrs: 1,

-		},

 	}

 	for _, tc := range testCases {

deleted file mode 100644

@@ -1,117 +0,0 @@

-package cache

-

-import (

-	"fmt"

-

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

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

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

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"

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

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

-)

-

-type ProjectCache struct {

-	Client              client.Interface

-	Store               cache.Store

-	DefaultNodeSelector string

-}

-

-var pcache *ProjectCache

-

-func (p *ProjectCache) GetNamespaceObject(name string) (*kapi.Namespace, error) {

-	// check for namespace in the cache

-	namespaceObj, exists, err := p.Store.Get(&kapi.Namespace{

-		ObjectMeta: kapi.ObjectMeta{

-			Name:      name,

-			Namespace: "",

-		},

-		Status: kapi.NamespaceStatus{},

-	})

-	if err != nil {

-		return nil, err

-	}

-

-	var namespace *kapi.Namespace

-	if exists {

-		namespace = namespaceObj.(*kapi.Namespace)

-	} else {

-		// Our watch maybe latent, so we make a best effort to get the object, and only fail if not found

-		namespace, err = p.Client.Namespaces().Get(name)

-		// the namespace does not exist, so prevent create and update in that namespace

-		if err != nil {

-			return nil, fmt.Errorf("Namespace %s does not exist", name)

-		}

-	}

-	return namespace, nil

-}

-

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

-	selector := ""

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

-		if ns, ok := namespace.ObjectMeta.Annotations["nodeSelector"]; ok {

-			selector = ns

-		}

-	}

-	if len(selector) == 0 {

-		selector = p.DefaultNodeSelector

-	}

-	return selector

-}

-

-func (p *ProjectCache) GetNodeSelectorObject(namespace *kapi.Namespace) (labels.Selector, error) {

-	selector := p.GetNodeSelector(namespace)

-	if len(selector) == 0 {

-		return labels.Everything(), nil

-	} else {

-		selectorObj, err := labels.Parse(selector)

-		if err != nil {

-			return nil, err

-		}

-		return selectorObj, nil

-	}

-}

-

-func GetProjectCache() (*ProjectCache, error) {