@@ -8,4 +8,5 @@

 .vimrc

 .vagrant-openshift.json*

 .DS_Store

-*.pyc

+.idea

+origin.iml

@@ -45,7 +45,7 @@ func (a *Authenticator) AuthenticatePassword(username, password string) (api.Use

 	info := &api.DefaultUserInfo{

 		Name: user.Name,

-		UID:  user.UID,

+		UID:  string(user.UID),

 	}

 	return info, true, nil

@@ -32,7 +32,7 @@ func (p *alwaysCreateUserIdentityToUserMapper) UserFor(identityInfo authapi.User

 	ret := &authapi.DefaultUserInfo{

 		Name:  authoritativeMapping.User.Name,

-		UID:   authoritativeMapping.User.UID,

+		UID:   string(authoritativeMapping.User.UID),

 		Extra: authoritativeMapping.Identity.Extra,

 	}

 	return ret, err

@@ -10,6 +10,7 @@ func init() {

 		&BuildList{},

 		&BuildConfig{},

 		&BuildConfigList{},

+		&BuildLog{},

 	)

 }

@@ -17,3 +18,4 @@ func (*Build) IsAnAPIObject()           {}

 func (*BuildList) IsAnAPIObject()       {}

 func (*BuildConfig) IsAnAPIObject()     {}

 func (*BuildConfigList) IsAnAPIObject() {}

+func (*BuildLog) IsAnAPIObject()        {}

@@ -332,3 +332,9 @@ type GitInfo struct {

 	GitBuildSource    `json:",inline"`

 	GitSourceRevision `json:",inline"`

 }

+

+// BuildLog is the (unused) resource associated with the build log redirector

+type BuildLog struct {

+	kapi.TypeMeta `json:",inline"`

+	kapi.ListMeta `json:"metadata,omitempty"`

+}

@@ -10,11 +10,12 @@ func init() {

 		&BuildList{},

 		&BuildConfig{},

 		&BuildConfigList{},

+		&BuildLog{},

 	)

-	api.Scheme.AddKnownTypeWithName("v1beta1", "BuildLog", &Build{})

 }

 func (*Build) IsAnAPIObject()           {}

 func (*BuildList) IsAnAPIObject()       {}

 func (*BuildConfig) IsAnAPIObject()     {}

 func (*BuildConfigList) IsAnAPIObject() {}

+func (*BuildLog) IsAnAPIObject()        {}

@@ -57,8 +57,8 @@ const (

 	// BuildStatusRunning indicates that a pod has been created and a build is running.

 	BuildStatusRunning BuildStatus = "Running"

-	BuildStatusComplete BuildStatus = "Complete"

 	// BuildStatusComplete indicates that a build has been successful.

+	BuildStatusComplete BuildStatus = "Complete"

 	// BuildStatusFailed indicates that a build has executed and failed.

 	BuildStatusFailed BuildStatus = "Failed"

@@ -340,3 +340,9 @@ type GitInfo struct {

 	GitBuildSource    `json:",inline"`

 	GitSourceRevision `json:",inline"`

 }

+

+// BuildLog is the (unused) resource associated with the build log redirector

+type BuildLog struct {

+	kapi.TypeMeta `json:",inline"`

+	kapi.ListMeta `json:"metadata,omitempty"`

+}

@@ -17,8 +17,8 @@ const dockerSocketPath = "/var/run/docker.sock"

 func setupDockerSocket(podSpec *kapi.Pod) {

 	dockerSocketVolume := kapi.Volume{

 		Name: "docker-socket",

-		Source: &kapi.VolumeSource{

-			HostDir: &kapi.HostDir{

+		Source: kapi.VolumeSource{

+			HostPath: &kapi.HostPath{

 				Path: dockerSocketPath,

 			},

 		},

@@ -44,8 +44,8 @@ func setupDockerConfig(podSpec *kapi.Pod) {

 	}

 	dockerConfigVolume := kapi.Volume{

 		Name: "docker-cfg",

-		Source: &kapi.VolumeSource{

-			HostDir: &kapi.HostDir{

+		Source: kapi.VolumeSource{

+			HostPath: &kapi.HostPath{

 				Path: dockerConfig,

 			},

 		},

@@ -24,16 +24,19 @@ func TestSetupDockerSocketHostSocket(t *testing.T) {

 	if e, a := "docker-socket", volume.Name; e != a {

 		t.Errorf("Expected %s, got %s", e, a)

 	}

-	if volume.Source == nil {

+	if volume.Name == "" {

+		t.Fatalf("Unexpected empty volume source name")

+	}

+	if isVolumeSourceEmpty(volume.Source) {

 		t.Fatalf("Unexpected nil volume source")

 	}

-	if volume.Source.HostDir == nil {

+	if volume.Source.HostPath == nil {

 		t.Fatalf("Unexpected nil host directory")

 	}

 	if volume.Source.EmptyDir != nil {

 		t.Errorf("Unexpected non-nil empty directory: %#v", volume.Source.EmptyDir)

 	}

-	if e, a := "/var/run/docker.sock", volume.Source.HostDir.Path; e != a {

+	if e, a := "/var/run/docker.sock", volume.Source.HostPath.Path; e != a {

 		t.Errorf("Expected %s, got %s", e, a)

 	}

@@ -52,6 +55,18 @@ func TestSetupDockerSocketHostSocket(t *testing.T) {

 	}

 }

+func isVolumeSourceEmpty(volumeSource kapi.VolumeSource) bool {

+

+	if volumeSource.EmptyDir == nil &&

+		volumeSource.HostPath == nil &&

+		volumeSource.GCEPersistentDisk == nil &&

+		volumeSource.GitRepo == nil {

+		return true

+	}

+

+	return false

+}

+

 func TestSetupBuildEnvFails(t *testing.T) {

 	build := mockCustomBuild()

 	containerEnv := []kapi.EnvVar{

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

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

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

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

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

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

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

@@ -35,7 +34,7 @@ func (r RealPodControl) getPod(namespace, name string) (*kapi.Pod, error) {

 }

 // NewREST creates a new REST for BuildLog

-// Takes build registry and pod client to get neccessary attibutes to assamble

+// Takes build registry and pod client to get necessary attributes to assemble

 // URL to which the request shall be redirected in order to get build logs.

 func NewREST(b build.Registry, pn kclient.PodsNamespacer) apiserver.RESTStorage {

 	return &REST{

@@ -99,25 +98,5 @@ func (r *REST) Get(ctx kapi.Context, id string) (runtime.Object, error) {

 }

 func (r *REST) New() runtime.Object {

-	return nil

-}

-

-func (*REST) NewList() runtime.Object {

-	return nil

-}

-

-func (r *REST) List(ctx kapi.Context, selector, fields labels.Selector) (runtime.Object, error) {

-	return nil, fmt.Errorf("BuildLog can't be listed")

-}

-

-func (r *REST) Delete(ctx kapi.Context, id string) (<-chan apiserver.RESTResult, error) {

-	return nil, fmt.Errorf("BuildLog can't be deleted")

-}

-

-func (r *REST) Create(ctx kapi.Context, obj runtime.Object) (<-chan apiserver.RESTResult, error) {

-	return nil, fmt.Errorf("BuildLog can't be created")

-}

-

-func (r *REST) Update(ctx kapi.Context, obj runtime.Object) (<-chan apiserver.RESTResult, error) {

-	return nil, fmt.Errorf("BuildLog can't be updated")

+	return &api.BuildLog{}

 }

@@ -98,7 +98,9 @@ func defaultClientConfig(flags *pflag.FlagSet) clientcmd.ClientConfig {

 	flags.StringVar(&loadingRules.CommandLinePath, "kubeconfig", "", "Path to the kubeconfig file to use for CLI requests.")

 	overrides := &clientcmd.ConfigOverrides{}

-	clientcmd.BindOverrideFlags(overrides, flags, clientcmd.RecommendedConfigOverrideFlags(""))

+	overrideFlags := clientcmd.RecommendedConfigOverrideFlags("")

+	overrideFlags.ContextOverrideFlags.NamespaceShort = "n"

+	clientcmd.BindOverrideFlags(overrides, flags, overrideFlags)

 	clientConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, overrides)

 	return clientConfig

@@ -23,7 +23,8 @@ $ kubectl build-logs 566bed879d2d

 				usageError(cmd, "<build> is a required argument")

 			}

-			namespace := getOriginNamespace(cmd)

+			namespace, err := f.DefaultNamespace(cmd)

+			checkErr(err)

 			mapper, _ := f.Object(cmd)

 			mapping, err := mapper.RESTMapping("BuildLog", kubecmd.GetFlagString(cmd, "api-version"))

@@ -40,7 +40,8 @@ Examples:

 			}

 			buildName := args[0]

-			namespace := getOriginNamespace(cmd)

+			namespace, err := f.DefaultNamespace(cmd)

+			checkErr(err)

 			client, _, err := f.Clients(cmd)

 			checkErr(err)

@@ -3,9 +3,6 @@ package cmd

 import (

 	"os"

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

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

-	kubecmd "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd"

 	"github.com/golang/glog"

 	"github.com/spf13/cobra"

 )

@@ -21,20 +18,3 @@ func checkErr(err error) {

 		glog.FatalDepth(1, err)

 	}

 }

-

-func getOriginNamespace(cmd *cobra.Command) string {

-	result := kapi.NamespaceDefault

-	if ns := kubecmd.GetFlagString(cmd, "namespace"); len(ns) > 0 {

-		result = ns

-		glog.V(2).Infof("Using namespace from -ns flag")

-	} else {

-		nsPath := kubecmd.GetFlagString(cmd, "ns-path")

-		nsInfo, err := kubectl.LoadNamespaceInfo(nsPath)

-		if err != nil {

-			glog.Fatalf("Error loading current namespace: %v", err)

-		}

-		result = nsInfo.Namespace

-	}

-	glog.V(2).Infof("Using namespace %s", result)

-	return result

-}

@@ -57,10 +57,13 @@ Examples:

 			schema, err := f.Validator(cmd)

 			checkErr(err)

-			namespace := getOriginNamespace(cmd)

+			cfg, err := f.ClientConfig(cmd)

+			checkErr(err)

+			namespace, err := f.DefaultNamespace(cmd)

+			checkErr(err)

 			mapper, typer := f.Object(cmd)

-			mapping, _, _, data := kubecmd.ResourceFromFile(cmd, filename, typer, mapper, schema)

+			mapping, _, _, data := kubecmd.ResourceFromFile(filename, typer, mapper, schema, cfg.Version)

 			obj, err := mapping.Codec.Decode(data)

 			checkErr(err)

@@ -67,7 +67,8 @@ func NewCmdRollback(parentName string, name string, f *Factory, out io.Writer) *

 			osClient, _, err := f.Clients(cmd)

 			checkErr(err)

-			namespace := getOriginNamespace(cmd)

+			namespace, err := f.DefaultNamespace(cmd)

+			checkErr(err)

 			// Generate the rollback config

 			newConfig, err := osClient.DeploymentConfigs(namespace).Rollback(rollback)

@@ -36,7 +36,8 @@ Examples:

 			client, _, err := f.Clients(cmd)

 			checkErr(err)

-			namespace := getOriginNamespace(cmd)

+			namespace, err := f.DefaultNamespace(cmd)

+			checkErr(err)

 			var newBuild *build.Build

 			if len(buildName) == 0 {

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

 	"reflect"

 	"time"

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

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

 	kconfig "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/config"

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

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

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

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

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

+

 	"github.com/coreos/go-etcd/etcd"

 	"github.com/fsouza/go-dockerclient"

 	"github.com/golang/glog"

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

 	dockerutil "github.com/openshift/origin/pkg/cmd/util/docker"

+	"github.com/openshift/origin/pkg/kubelet/app"

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

 )

@@ -103,7 +106,9 @@ func (c *NodeConfig) RunKubelet() {

 		5,

 		cfg.IsSourceSeen,

 		"",

-		net.IP(util.IP{}))

+		net.IP(util.IP{}),

+		kapi.NamespaceDefault,

+		app.ProbeVolumePlugins())

 	if err != nil {

 		glog.Fatalf("Couldn't run kubelet: %s", err)

 	}

@@ -12,7 +12,7 @@ import (

 	etcdclient "github.com/coreos/go-etcd/etcd"

 	"github.com/elazarl/go-bindata-assetfs"

-	"github.com/emicklei/go-restful"

+	restful "github.com/emicklei/go-restful"

 	"github.com/golang/glog"

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

@@ -285,7 +285,9 @@ func (c *MasterConfig) InstallAPI(container *restful.Container) []string {

 	admissionControl := admit.NewAlwaysAdmit()

-	apiserver.NewAPIGroupVersion(storage, v1beta1.Codec, OpenShiftAPIPrefixV1Beta1, latest.SelfLinker, admissionControl).InstallREST(container, OpenShiftAPIPrefix, "v1beta1")

+	if err := apiserver.NewAPIGroupVersion(storage, v1beta1.Codec, OpenShiftAPIPrefixV1Beta1, latest.SelfLinker, admissionControl).InstallREST(container, container.ServeMux, OpenShiftAPIPrefix, "v1beta1"); err != nil {

+		glog.Fatalf("Unable to initialize API: %v", err)

+	}

 	var root *restful.WebService

 	for _, svc := range container.RegisteredWebServices() {

new file mode 100644

@@ -0,0 +1,43 @@

+/*

+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 app

+

+// This file exists to force the desired plugin implementations to be linked.

+import (

+	// Credential providers

+	_ "github.com/GoogleCloudPlatform/kubernetes/pkg/credentialprovider/gcp"

+	// Volume plugins

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/volume"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/volume/empty_dir"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/volume/gce_pd"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/volume/git_repo"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/volume/host_path"

+)

+

+func ProbeVolumePlugins() []volume.Plugin {

+	allPlugins := []volume.Plugin{}

+

+	// The list of plugins to probe is decided by the kubelet binary, not

+	// by dynamic linking or other "magic".  Plugins will be analyzed and

+	// initialized later.

+	allPlugins = append(allPlugins, empty_dir.ProbeVolumePlugins()...)

+	allPlugins = append(allPlugins, gce_pd.ProbeVolumePlugins()...)

+	allPlugins = append(allPlugins, git_repo.ProbeVolumePlugins()...)

+	allPlugins = append(allPlugins, host_path.ProbeVolumePlugins()...)

+

+	return allPlugins

+}

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

 	"code.google.com/p/go-uuid/uuid"

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

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

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

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

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

@@ -62,14 +63,14 @@ func (r *Etcd) CreateOrUpdateUserIdentityMapping(mapping *api.UserIdentityMappin

 		// did not previously exist

 		if existing.Identity.Name == "" {

 			uid := uuid.New()

-			existing.User.UID = uid

+			existing.User.UID = types.UID(uid)

 			existing.User.Name = name

 			if err := r.initializer.InitializeUser(&mapping.Identity, &existing.User); err != nil {

 				return in, err

 			}

 			// set these again to prevent bad initialization from messing up data

-			existing.User.UID = uid

+			existing.User.UID = types.UID(uid)

 			existing.User.Name = name

 			existing.Identity = mapping.Identity

@@ -35,6 +35,7 @@ func init() {

 }

 func TestListBuilds(t *testing.T) {

+

 	deleteAllEtcdKeys()

 	openshift := NewTestBuildOpenshift(t)

 	defer openshift.Close()

@@ -49,6 +50,7 @@ func TestListBuilds(t *testing.T) {

 }

 func TestCreateBuild(t *testing.T) {

+

 	deleteAllEtcdKeys()

 	openshift := NewTestBuildOpenshift(t)

 	defer openshift.Close()

@@ -192,7 +194,7 @@ func NewTestBuildOpenshift(t *testing.T) *testBuildOpenshift {

 	}

 	osPrefix := "/osapi/v1beta1"

-	apiserver.NewAPIGroupVersion(storage, latest.Codec, osPrefix, interfaces.MetadataAccessor, admit.NewAlwaysAdmit()).InstallREST(handlerContainer, "/osapi", "v1beta1")

+	apiserver.NewAPIGroupVersion(storage, latest.Codec, osPrefix, interfaces.MetadataAccessor, admit.NewAlwaysAdmit()).InstallREST(handlerContainer, osMux, "/osapi", "v1beta1")

 	openshift.whPrefix = osPrefix + "/buildConfigHooks/"

 	osMux.Handle(openshift.whPrefix, http.StripPrefix(openshift.whPrefix,

@@ -324,6 +324,7 @@ func NewTestOpenshift(t *testing.T) *testOpenshift {

 	etcdHelper, _ := master.NewEtcdHelper(etcdClient, klatest.Version)

 	osMux := http.NewServeMux()

+	muxHelper := &apiserver.MuxHelper{osMux, []string{}}

 	openshift.Server = httptest.NewServer(osMux)

 	kubeClient := client.NewOrDie(&client.Config{Host: openshift.Server.URL, Version: klatest.Version})

@@ -376,7 +377,7 @@ func NewTestOpenshift(t *testing.T) *testOpenshift {

 	}

 	osPrefix := "/osapi/v1beta1"

-	apiserver.NewAPIGroupVersion(storage, v1beta1.Codec, osPrefix, interfaces.MetadataAccessor, admit.NewAlwaysAdmit()).InstallREST(handlerContainer, "/osapi", "v1beta1")

+	apiserver.NewAPIGroupVersion(storage, v1beta1.Codec, osPrefix, interfaces.MetadataAccessor, admit.NewAlwaysAdmit()).InstallREST(handlerContainer, muxHelper, "/osapi", "v1beta1")

 	dccFactory := deploycontrollerfactory.DeploymentConfigControllerFactory{

 		Client:     osClient,

@@ -409,6 +410,7 @@ func NewTestOpenshift(t *testing.T) *testOpenshift {

 	}

 	biccFactory.Create().Run()

+

 	return openshift

 }

@@ -232,7 +232,7 @@ func NewTestImageOpenShift(t *testing.T) *testImageOpenshift {

 		EtcdHelper:         etcdHelper,

 		HealthCheckMinions: false,

 		KubeletClient:      kubeletClient,

-		APIPrefix:          "/api/v1beta1",

+		APIPrefix:          "/api",

 		RestfulContainer:   handlerContainer,

 	})

@@ -248,7 +248,7 @@ func NewTestImageOpenShift(t *testing.T) *testImageOpenshift {

 	}

 	osPrefix := "/osapi/v1beta1"

-	apiserver.NewAPIGroupVersion(storage, latest.Codec, osPrefix, interfaces.MetadataAccessor, admit.NewAlwaysAdmit()).InstallREST(handlerContainer, "/osapi", "v1beta1")

+	apiserver.NewAPIGroupVersion(storage, latest.Codec, osPrefix, interfaces.MetadataAccessor, admit.NewAlwaysAdmit()).InstallREST(handlerContainer, osMux, "/osapi", "v1beta1")

 	return openshift

 }

@@ -199,7 +199,7 @@ func TestUserLookup(t *testing.T) {

 	if !ok {

 		t.Fatalf("should have been authenticated")

 	}

-	if user.Name != info.GetName() || user.UID != info.GetUID() {

+	if user.Name != info.GetName() || string(user.UID) != info.GetUID() {

 		t.Errorf("unexpected user info", info)

 	}

 }

@@ -59,7 +59,7 @@ func TestTemplateTransformationFromConfig(t *testing.T) {

 	interfaces, _ := latest.InterfacesFor(latest.Version)

 	osPrefix := "/osapi/v1beta1"

 	handlerContainer := master.NewHandlerContainer(osMux)

-	apiserver.NewAPIGroupVersion(storage, latest.Codec, osPrefix, interfaces.MetadataAccessor, admit.NewAlwaysAdmit()).InstallREST(handlerContainer, "/osapi", "v1beta1")

+	apiserver.NewAPIGroupVersion(storage, latest.Codec, osPrefix, interfaces.MetadataAccessor, admit.NewAlwaysAdmit()).InstallREST(handlerContainer, osMux, "/osapi", "v1beta1")

 	walkJSONFiles("fixtures", func(name, path string, _ []byte) {

 		config := &config.Config{}