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

 	klatest "k8s.io/kubernetes/pkg/api/latest"

 	kmeta "k8s.io/kubernetes/pkg/api/meta"

 	"k8s.io/kubernetes/pkg/runtime"

-	"k8s.io/kubernetes/pkg/util"

+	"k8s.io/kubernetes/pkg/util/sets"

 	"github.com/golang/glog"

@@ -76,7 +76,7 @@ func InterfacesFor(version string) (*kmeta.VersionInterfaces, error) {

 }

 // originTypes are the hardcoded types defined by the OpenShift API.

-var originTypes = util.StringSet{}

+var originTypes = sets.String{}

 // UserResources are the resource names that apply to the primary, user facing resources used by

 // client tools. They are in deletion-first order - dependent resources should be last.

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

 	versions := []string{"v1", "v1beta3"}

 	originMapper := kmeta.NewDefaultRESTMapper(

+		"",

 		versions,

 		func(version string) (*kmeta.VersionInterfaces, error) {

 			interfaces, err := InterfacesFor(version)

@@ -50,11 +50,11 @@ func NewCmdExpose(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.C

 	// when validating the use of it (invalid for routes)

 	cmd.Flags().Set("protocol", "")

 	cmd.Flag("protocol").DefValue = ""

+	defRun := cmd.Run

 	cmd.Run = func(cmd *cobra.Command, args []string) {

 		err := validate(cmd, f, args)

 		cmdutil.CheckErr(err)

-		err = kcmd.RunExpose(f.Factory, out, cmd, args)

-		cmdutil.CheckErr(err)

+		defRun(cmd, args)

 	}

 	cmd.Flags().String("hostname", "", "Set a hostname for the new route")

 	return cmd

@@ -63,7 +63,7 @@ func NewCmdExpose(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.C

 // validate adds one layer of validation prior to calling the upstream

 // expose command.

 func validate(cmd *cobra.Command, f *clientcmd.Factory, args []string) error {

-	namespace, _, err := f.DefaultNamespace()

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

 	if err != nil {

 		return err

 	}

@@ -77,17 +77,10 @@ func validate(cmd *cobra.Command, f *clientcmd.Factory, args []string) error {

 	r := resource.NewBuilder(mapper, typer, f.ClientMapperForCommand()).

 		ContinueOnError().

 		NamespaceParam(namespace).DefaultNamespace().

+		FilenameParam(enforceNamespace, cmdutil.GetFlagStringSlice(cmd, "filename")...).

 		ResourceTypeOrNameArgs(false, args...).

 		Flatten().

 		Do()

-	err = r.Err()

-	if err != nil {

-		return err

-	}

-	mapping, err := r.ResourceMapping()

-	if err != nil {

-		return err

-	}

 	infos, err := r.Infos()

 	if err != nil {

 		return err

@@ -96,12 +89,13 @@ func validate(cmd *cobra.Command, f *clientcmd.Factory, args []string) error {

 		return fmt.Errorf("multiple resources provided: %v", args)

 	}

 	info := infos[0]

+	mapping := info.ResourceMapping()

 	generator := cmdutil.GetFlagString(cmd, "generator")

 	switch mapping.Kind {

 	case "Service":

 		switch generator {

-		case "service/v1":

+		case "service/v1", "service/v2":

 			// Set default protocol back for generating services

 			if len(cmdutil.GetFlagString(cmd, "protocol")) == 0 {

 				cmd.Flags().Set("protocol", "TCP")

@@ -141,7 +135,7 @@ func validate(cmd *cobra.Command, f *clientcmd.Factory, args []string) error {

 			// Default exposing everything except services as a service

 			cmd.Flags().Set("generator", "service/v1")

 			fallthrough

-		case "service/v1":

+		case "service/v1", "service/v2":

 			// Set default protocol back for generating services

 			if len(cmdutil.GetFlagString(cmd, "protocol")) == 0 {

 				cmd.Flags().Set("protocol", "TCP")

@@ -158,11 +152,12 @@ func validate(cmd *cobra.Command, f *clientcmd.Factory, args []string) error {

 func validateFlags(cmd *cobra.Command, generator string) error {

 	invalidFlags := []string{}

-	if generator == "service/v1" {

+	switch generator {

+	case "service/v1", "service/v2":

 		if len(cmdutil.GetFlagString(cmd, "hostname")) != 0 {

 			invalidFlags = append(invalidFlags, "--hostname")

 		}

-	} else if generator == "route/v1" {

+	case "route/v1":

 		if len(cmdutil.GetFlagString(cmd, "protocol")) != 0 {

 			invalidFlags = append(invalidFlags, "--protocol")

 		}

@@ -178,8 +173,8 @@ func validateFlags(cmd *cobra.Command, generator string) error {

 		if len(cmdutil.GetFlagString(cmd, "target-port")) != 0 {

 			invalidFlags = append(invalidFlags, "--target-port")

 		}

-		if len(cmdutil.GetFlagString(cmd, "public-ip")) != 0 {

-			invalidFlags = append(invalidFlags, "--public-ip")

+		if len(cmdutil.GetFlagString(cmd, "external-ip")) != 0 {

+			invalidFlags = append(invalidFlags, "--external-ip")

 		}

 		if cmdutil.GetFlagInt(cmd, "port") != -1 {

 			invalidFlags = append(invalidFlags, "--port")

@@ -10,8 +10,8 @@ import (

 	"github.com/golang/glog"

 	kapi "k8s.io/kubernetes/pkg/api"

-	"k8s.io/kubernetes/pkg/client"

 	"k8s.io/kubernetes/pkg/client/record"

+	client "k8s.io/kubernetes/pkg/client/unversioned"

 	endpointcontroller "k8s.io/kubernetes/pkg/controller/endpoint"

 	namespacecontroller "k8s.io/kubernetes/pkg/controller/namespace"

 	nodecontroller "k8s.io/kubernetes/pkg/controller/node"

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

 // RunNamespaceController starts the Kubernetes Namespace Manager

 func (c *MasterConfig) RunNamespaceController() {

-	namespaceController := namespacecontroller.NewNamespaceController(c.KubeClient, c.ControllerManager.NamespaceSyncPeriod)

+	// TODO: Add OR c.ControllerManager.EnableDeploymentController once we have upstream deployments

+	experimentalMode := c.ControllerManager.EnableHorizontalPodAutoscaler

+	namespaceController := namespacecontroller.NewNamespaceController(c.KubeClient, experimentalMode, c.ControllerManager.NamespaceSyncPeriod)

 	namespaceController.Run()

 }

@@ -68,7 +70,7 @@ func (c *MasterConfig) RunPersistentVolumeClaimBinder() {

 }

 func (c *MasterConfig) RunPersistentVolumeClaimRecycler(recyclerImageName string) {

-	defaultScrubPod := volume.GetDefaultPersistentVolumeRecyclerPod()

+	defaultScrubPod := volume.NewPersistentVolumeRecyclerPodTemplate()

 	defaultScrubPod.Spec.Containers[0].Image = recyclerImageName

 	defaultScrubPod.Spec.Containers[0].Command = []string{"/usr/share/openshift/scripts/volumes/recycler.sh"}

 	defaultScrubPod.Spec.Containers[0].Args = []string{"/scrub"}

@@ -76,12 +78,12 @@ func (c *MasterConfig) RunPersistentVolumeClaimRecycler(recyclerImageName string

 	hostPathConfig := volume.VolumeConfig{

 		RecyclerMinimumTimeout:   30,

 		RecyclerTimeoutIncrement: 30,

-		RecyclerDefaultPod:       defaultScrubPod,

+		RecyclerPodTemplate:      defaultScrubPod,

 	}

 	nfsConfig := volume.VolumeConfig{

 		RecyclerMinimumTimeout:   180,

 		RecyclerTimeoutIncrement: 30,

-		RecyclerDefaultPod:       defaultScrubPod,

+		RecyclerPodTemplate:      defaultScrubPod,

 	}

 	allPlugins := []volume.VolumePlugin{}

@@ -136,7 +138,7 @@ func (c *MasterConfig) RunNodeController() {

 		c.KubeClient,

 		s.PodEvictionTimeout,

-		nodecontroller.NewPodEvictor(util.NewTokenBucketRateLimiter(s.DeletingPodsQps, s.DeletingPodsBurst)),

+		util.NewTokenBucketRateLimiter(s.DeletingPodsQps, s.DeletingPodsBurst),

 		s.NodeMonitorGracePeriod,

 		s.NodeStartupGracePeriod,

@@ -28,7 +28,7 @@ import (

 )

 // AdmissionPlugins is the full list of admission control plugins to enable in the order they must run

-var AdmissionPlugins = []string{"NamespaceExists", "NamespaceLifecycle", "OriginPodNodeEnvironment", "LimitRanger", "ServiceAccount", "SecurityContextConstraint", "ResourceQuota", "SCCExecRestrictions"}

+var AdmissionPlugins = []string{"NamespaceLifecycle", "OriginPodNodeEnvironment", "LimitRanger", "ServiceAccount", "SecurityContextConstraint", "ResourceQuota", "SCCExecRestrictions"}

 // MasterConfig defines the required values to start a Kubernetes master

 type MasterConfig struct {

@@ -149,6 +149,7 @@ func (c *NodeConfig) RunProxy() {

 	endpointsConfig := pconfig.NewEndpointsConfig()

 	loadBalancer := proxy.NewLoadBalancerRR()

 	endpointsConfig.RegisterHandler(loadBalancer)

+	syncPeriod := 5 * time.Second

 	host, _, err := net.SplitHostPort(c.BindAddress)

 	if err != nil {

@@ -165,7 +166,7 @@ func (c *NodeConfig) RunProxy() {

 	}

 	go util.Forever(func() {

-		proxier, err := proxy.NewProxier(loadBalancer, ip, iptables.New(kexec.New(), protocol), util.PortRange{})

+		proxier, err := proxy.NewProxier(loadBalancer, ip, iptables.New(kexec.New(), protocol), util.PortRange{}, syncPeriod)

 		if err != nil {

 			switch {

 			// conflicting use of iptables, retry

@@ -22,6 +22,9 @@ var admissionPluginsNotUsedByKube = sets.NewString(

 	"BuildByStrategy",          // from origin, only needed for managing builds, not kubernetes resources

 	"OriginNamespaceLifecycle", // from origin, only needed for rejecting openshift resources, so not needed by kube

+

+	"NamespaceExists",  // superceded by NamespaceLifecycle

+	"InitialResources", // do we want this? https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/initial-resources.md

 )

 func TestKubeAdmissionControllerUsage(t *testing.T) {

@@ -367,8 +367,10 @@ func (m *Master) Start() error {

 	// Allow privileged containers

 	// TODO: make this configurable and not the default https://github.com/openshift/origin/issues/662

 	capabilities.Initialize(capabilities.Capabilities{

-		AllowPrivileged:    true,

-		HostNetworkSources: []string{kubelet.ApiserverSource, kubelet.FileSource},

+		AllowPrivileged: true,

+		PrivilegedSources: capabilities.PrivilegedSources{

+			HostNetworkSources: []string{kubelet.ApiserverSource, kubelet.FileSource},

+		},

 	})

 	openshiftConfig, err := origin.BuildMasterConfig(*m.config)

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

 	"k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/api/errors"

-	"k8s.io/kubernetes/pkg/client"

 	"k8s.io/kubernetes/pkg/client/cache"

+	client "k8s.io/kubernetes/pkg/client/unversioned"

 	"k8s.io/kubernetes/pkg/fields"

 	"k8s.io/kubernetes/pkg/labels"

 	"k8s.io/kubernetes/pkg/watch"

@@ -122,3 +122,6 @@ func (a cachedServiceNamespacer) Delete(name string) error {

 func (a cachedServiceNamespacer) Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {

 	return nil, fmt.Errorf("not implemented")

 }

+func (a cachedServiceNamespacer) ProxyGet(name, path string, params map[string]string) client.ResponseWrapper {

+	return nil

+}

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

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

 )

-// RouteGenerator implements the kubectl.Generator interface for routes

+// RouteGenerator generates routes from a given set of parameters

 type RouteGenerator struct{}

+// RouteGenerator implements the kubectl.Generator interface for routes

+var _ kubectl.Generator = RouteGenerator{}

+

 // ParamNames returns the parameters required for generating a route

 func (RouteGenerator) ParamNames() []kubectl.GeneratorParam {

 	return []kubectl.GeneratorParam{

@@ -24,12 +27,21 @@ func (RouteGenerator) ParamNames() []kubectl.GeneratorParam {

 }

 // Generate accepts a set of parameters and maps them into a new route

-func (RouteGenerator) Generate(params map[string]string) (runtime.Object, error) {

+func (RouteGenerator) Generate(genericParams map[string]interface{}) (runtime.Object, error) {

 	var (

 		labels map[string]string

 		err    error

 	)

+	params := map[string]string{}

+	for key, value := range genericParams {

+		strVal, isString := value.(string)

+		if !isString {

+			return nil, fmt.Errorf("expected string, saw %v for '%s'", value, key)

+		}

+		params[key] = strVal

+	}

+

 	labelString, found := params["labels"]

 	if found && len(labelString) > 0 {

 		labels, err = kubectl.ParseLabels(labelString)

@@ -59,7 +71,3 @@ func (RouteGenerator) Generate(params map[string]string) (runtime.Object, error)

 		},

 	}, nil

 }

-

-// Useful pattern for validating that RouteGenerator implements

-// the Generator interface

-var _ kubectl.Generator = RouteGenerator{}