@@ -51,7 +51,6 @@ readonly OPENSHIFT_BINARY_SYMLINKS=(

   openshift-sti-build

   openshift-docker-build

   osc

-  openshift-experimental

 )

 readonly OPENSHIFT_BINARY_COPY=(

   osc

@@ -10,6 +10,8 @@ set -o pipefail

 OS_ROOT=$(dirname "${BASH_SOURCE}")/..

 source "${OS_ROOT}/hack/util.sh"

+os::log::install_errexit

+

 function cleanup()

 {

     out=$?

@@ -39,9 +41,11 @@ API_HOST=${API_HOST:-127.0.0.1}

 KUBELET_SCHEME=${KUBELET_SCHEME:-http}

 KUBELET_PORT=${KUBELET_PORT:-10250}

-ETCD_DATA_DIR=$(mktemp -d /tmp/openshift.local.etcd.XXXX)

-VOLUME_DIR=$(mktemp -d /tmp/openshift.local.volumes.XXXX)

-CERT_DIR="${CERT_DIR:-$(mktemp -d /tmp/openshift.local.certificates.XXXX)}"

+TEMP_DIR=$(mktemp -d /tmp/openshift-cmd.XXXX)

+ETCD_DATA_DIR="${TEMP_DIR}/etcd"

+VOLUME_DIR="${TEMP_DIR}/volumes"

+CERT_DIR="${TEMP_DIR}/certs"

+mkdir -p "${ETCD_DATA_DIR}" "${VOLUME_DIR}" "${CERT_DIR}"

 # handle profiling defaults

 profile="${OPENSHIFT_PROFILE-}"

@@ -91,6 +95,14 @@ export OPENSHIFT_PROFILE="${CLI_PROFILE-}"

 # Begin tests

 #

+# verify some default commands

+[ "$(openshift cli)" ]

+[ "$(openshift ex)" ]

+[ "$(openshift ex config 2>&1)" ]

+[ "$(openshift ex tokens)" ]

+[ "$(openshift kubectl)" ]

+[ "$(openshift kube 2>&1)" ]

+

 osc get pods --match-server-version

 osc create -f examples/hello-openshift/hello-pod.json

 osc delete pods hello-openshift

@@ -138,6 +150,10 @@ echo "deploymentConfigs: ok"

 osc process -f examples/guestbook/template.json | osc apply -f -

 echo "template+config: ok"

+openshift kube resize --replicas=2 rc guestbook

+osc get pods

+echo "resize: ok"

+

 osc process -f examples/sample-app/application-template-dockerbuild.json | osc apply -f -

 echo "buildConfig: ok"

@@ -188,3 +188,125 @@ function time_now()

 {

   echo $(($(date +'%s * 1000 + %-N / 1000000')))

 }

+

+# Handler for when we exit automatically on an error.

+# Borrowed from https://gist.github.com/ahendrix/7030300

+os::log::errexit() {

+  local err="${PIPESTATUS[@]}"

+

+  # If the shell we are in doesn't have errexit set (common in subshells) then

+  # don't dump stacks.

+  set +o | grep -qe "-o errexit" || return

+

+  set +o xtrace

+  local code="${1:-1}"

+  os::log::error_exit "'${BASH_COMMAND}' exited with status $err" "${1:-1}" 1

+}

+

+os::log::install_errexit() {

+  # trap ERR to provide an error handler whenever a command exits nonzero  this

+  # is a more verbose version of set -o errexit

+  trap 'os::log::errexit' ERR

+

+  # setting errtrace allows our ERR trap handler to be propagated to functions,

+  # expansions and subshells

+  set -o errtrace

+}

+

+# Print out the stack trace

+#

+# Args:

+#   $1 The number of stack frames to skip when printing.

+os::log::stack() {

+  local stack_skip=${1:-0}

+  stack_skip=$((stack_skip + 1))

+  if [[ ${#FUNCNAME[@]} -gt $stack_skip ]]; then

+    echo "Call stack:" >&2

+    local i

+    for ((i=1 ; i <= ${#FUNCNAME[@]} - $stack_skip ; i++))

+    do

+      local frame_no=$((i - 1 + stack_skip))

+      local source_file=${BASH_SOURCE[$frame_no]}

+      local source_lineno=${BASH_LINENO[$((frame_no - 1))]}

+      local funcname=${FUNCNAME[$frame_no]}

+      echo "  $i: ${source_file}:${source_lineno} ${funcname}(...)" >&2

+    done

+  fi

+}

+

+# Log an error and exit.

+# Args:

+#   $1 Message to log with the error

+#   $2 The error code to return

+#   $3 The number of stack frames to skip when printing.

+os::log::error_exit() {

+  local message="${1:-}"

+  local code="${2:-1}"

+  local stack_skip="${3:-0}"

+  stack_skip=$((stack_skip + 1))

+

+  local source_file=${BASH_SOURCE[$stack_skip]}

+  local source_line=${BASH_LINENO[$((stack_skip - 1))]}

+  echo "!!! Error in ${source_file}:${source_line}" >&2

+  [[ -z ${1-} ]] || {

+    echo "  ${1}" >&2

+  }

+

+  os::log::stack $stack_skip

+

+  echo "Exiting with status ${code}" >&2

+  exit "${code}"

+}

+

+# Log an error but keep going.  Don't dump the stack or exit.

+os::log::error() {

+  echo "!!! ${1-}" >&2

+  shift

+  for message; do

+    echo "    $message" >&2

+  done

+}

+

+# Print an usage message to stderr.  The arguments are printed directly.

+os::log::usage() {

+  echo >&2

+  local message

+  for message; do

+    echo "$message" >&2

+  done

+  echo >&2

+}

+

+os::log::usage_from_stdin() {

+  local messages=()

+  while read -r line; do

+    messages+=$line

+  done

+

+  os::log::usage "${messages[@]}"

+}

+

+# Print out some info that isn't a top level status line

+os::log::info() {

+  for message; do

+    echo "$message"

+  done

+}

+

+os::log::info_from_stdin() {

+  local messages=()

+  while read -r line; do

+    messages+=$line

+  done

+

+  os::log::info "${messages[@]}"

+}

+

+# Print a status line.  Formatted to show up in a stream of output.

+os::log::status() {

+  echo "+++ $1"

+  shift

+  for message; do

+    echo "    $message"

+  done

+}

@@ -10,7 +10,6 @@ RUN mkdir -p /var/lib/openshift

 ADD bin/openshift        /usr/bin/openshift

 RUN ln -s /usr/bin/openshift /usr/bin/osc && \

-    ln -s /usr/bin/openshift /usr/bin/openshift-experimental && \

     ln -s /usr/bin/openshift /usr/bin/openshift-deploy && \

     ln -s /usr/bin/openshift /usr/bin/openshift-docker-build && \

     ln -s /usr/bin/openshift /usr/bin/openshift-sti-build && \

@@ -27,21 +27,23 @@ on all resources.  Some commands you can try:

 Note: This is an alpha release of OpenShift and will change significantly.  See

     https://github.com/openshift/origin for the latest information on OpenShift.

 `

+const defaultClusterURL = "https://localhost:8443"

-func NewCommandCLI(name string) *cobra.Command {

+func NewCommandCLI(name, fullName string) *cobra.Command {

 	// Main command

 	cmds := &cobra.Command{

 		Use:     name,

 		Aliases: []string{"kubectl"},

 		Short:   "Client tools for OpenShift",

-		Long:    fmt.Sprintf(longDesc, name),

+		Long:    fmt.Sprintf(longDesc, fullName),

 		Run: func(c *cobra.Command, args []string) {

+			c.SetOutput(os.Stdout)

 			c.Help()

 		},

 	}

 	// Override global default to https and port 8443

-	clientcmd.DefaultCluster.Server = "https://localhost:8443"

+	clientcmd.DefaultCluster.Server = defaultClusterURL

 	// TODO: there should be two client configs, one for OpenShift, and one for Kubernetes

 	clientConfig := defaultClientConfig(cmds.PersistentFlags())

@@ -51,10 +53,8 @@ func NewCommandCLI(name string) *cobra.Command {

 	// Kubernetes CRUD commands

 	cmds.AddCommand(f.NewCmdGet(out))

 	cmds.AddCommand(f.NewCmdDescribe(out))

-	cmds.AddCommand(

-		// Deprecate 'osc apply' with 'osc create' command.

-		applyToCreate(f.NewCmdCreate(out)),

-	)

+	// Deprecate 'osc apply' with 'osc create' command.

+	cmds.AddCommand(applyToCreate(f.NewCmdCreate(out)))

 	cmds.AddCommand(f.NewCmdUpdate(out))

 	cmds.AddCommand(f.NewCmdDelete(out))

 	cmds.AddCommand(kubecmd.NewCmdNamespace(out))

@@ -76,6 +76,23 @@ func NewCommandCLI(name string) *cobra.Command {

 	return cmds

 }

+// NewCmdKubectl provides exactly the functionality from Kubernetes,

+// but with support for OpenShift resources

+func NewCmdKubectl(name string) *cobra.Command {

+	flags := pflag.NewFlagSet("", pflag.ContinueOnError)

+	clientcmd.DefaultCluster.Server = defaultClusterURL

+	clientConfig := defaultClientConfig(flags)

+	f := cmd.NewFactory(clientConfig)

+	cmd := f.NewKubectlCommand(os.Stdout)

+	cmd.Use = name

+	cmd.Short = "Kubernetes cluster management via kubectl"

+	cmd.Long = cmd.Long + "\n\nThis command is provided for direct management of the Kubernetes cluster OpenShift runs on."

+	flags.VisitAll(func(flag *pflag.Flag) {

+		cmd.PersistentFlags().AddFlag(flag)

+	})

+	return cmd

+}

+

 // applyToCreate injects the deprecation notice about for 'apply' command into

 // 'create' command.

 // TODO: Remove this once we get rid of 'apply' in all documentation/etc.

deleted file mode 100644

@@ -1,23 +0,0 @@

-package api

-

-import (

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

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

-)

-

-// RESTClient provides REST interface compatible with Kubernetes RESTClient

-type RESTClient interface {

-	Verb(verb string) *client.Request

-	Put() *client.Request

-	Post() *client.Request

-	Delete() *client.Request

-	Get() *client.Request

-}

-

-// ClientMappings stores mapping between kind and client and codec

-// TODO: This struct is now obsoleted by kubectl

-type ClientMappings map[string]struct {

-	Kind   string

-	Client RESTClient

-	Codec  runtime.Codec

-}

deleted file mode 100644

@@ -1,49 +0,0 @@

-package build

-

-import (

-	"fmt"

-	"io"

-

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

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

-)

-

-var buildColumns = []string{"Name", "Type", "Status", "Pod Name"}

-var buildConfigColumns = []string{"Name", "Type", "SourceURI"}

-

-// RegisterPrintHandlers registers HumanReadablePrinter handlers

-// for build and buildConfig resources.

-func RegisterPrintHandlers(printer *kubecfg.HumanReadablePrinter) {

-	printer.Handler(buildColumns, printBuild)

-	printer.Handler(buildColumns, printBuildList)

-	printer.Handler(buildConfigColumns, printBuildConfig)

-	printer.Handler(buildConfigColumns, printBuildConfigList)

-}

-

-func printBuild(build *api.Build, w io.Writer) error {

-	_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", build.Name, build.Parameters.Strategy.Type, build.Status, build.PodName)

-	return err

-}

-

-func printBuildList(buildList *api.BuildList, w io.Writer) error {

-	for _, build := range buildList.Items {

-		if err := printBuild(&build, w); err != nil {

-			return err

-		}

-	}

-	return nil

-}

-

-func printBuildConfig(bc *api.BuildConfig, w io.Writer) error {

-	_, err := fmt.Fprintf(w, "%s\t%v\t%s\n", bc.Name, bc.Parameters.Strategy.Type, bc.Parameters.Source.Git.URI)

-	return err

-}

-

-func printBuildConfigList(buildList *api.BuildConfigList, w io.Writer) error {

-	for _, buildConfig := range buildList.Items {

-		if err := printBuildConfig(&buildConfig, w); err != nil {

-			return err

-		}

-	}

-	return nil

-}

deleted file mode 100644

@@ -1,62 +0,0 @@

-package client

-

-import (

-	"os"

-	"time"

-

-	"github.com/spf13/cobra"

-)

-

-// DEPRECATED, use NewCommandCLI instead

-func NewCommandKubecfg(name string) *cobra.Command {

-	cfg := &KubeConfig{}

-	cmd := &cobra.Command{

-		Use:   name,

-		Short: "DEPRECATED, use 'cli' instead",

-		Long: `

-DEPRECATED, use 'cli' instead

-

-Kubernetes Command Line - kubecfg

-

-OpenShift currently embeds the kubecfg command line for prototyping and debugging.

-` + usage(name),

-		Run: func(c *cobra.Command, args []string) {

-			if len(args) < 1 {

-				c.Help()

-				os.Exit(1)

-			}

-			cfg.Args = args

-			cfg.Run()

-		},

-	}

-	flag := cmd.Flags()

-	flag.BoolVar(&cfg.ServerVersion, "server_version", false, "Print the server's version number.")

-	flag.BoolVar(&cfg.PreventSkew, "expect_version_match", false, "Fail if server's version doesn't match own version.")

-	flag.StringVar(&cfg.ClientConfig.Host, "host", "", "The host to connect to.")

-	flag.StringVarP(&cfg.Config, "config", "c", "", "Path or URL to the config file, or '-' to read from STDIN")

-	flag.StringVarP(&cfg.Selector, "label", "l", "", "Selector (label query) to use for listing")

-	flag.DurationVarP(&cfg.UpdatePeriod, "update", "u", 60*time.Second, "Update interval period")

-	flag.StringVarP(&cfg.PortSpec, "port", "p", "", "The port spec, comma-separated list of <external>:<internal>,...")

-	flag.IntVarP(&cfg.ServicePort, "service", "s", -1, "If positive, create and run a corresponding service on this port, only used with 'run'")

-	flag.StringVar(&cfg.AuthConfig, "auth", os.Getenv("HOME")+"/.kubernetes_auth", "Path to the auth info file.  If missing, prompt the user.  Only used if doing https.")

-	flag.BoolVar(&cfg.JSON, "json", false, "If true, print raw JSON for responses")

-	flag.BoolVar(&cfg.YAML, "yaml", false, "If true, print raw YAML for responses")

-	flag.BoolVar(&cfg.Verbose, "verbose", false, "If true, print extra information")

-	flag.BoolVar(&cfg.Proxy, "proxy", false, "If true, run a proxy to the api server")

-	flag.StringVar(&cfg.WWW, "www", "", "If -proxy is true, use this directory to serve static files")

-	flag.StringVar(&cfg.TemplateFile, "template_file", "", "If present, load this file as a golang template and use it for output printing")

-	flag.StringVar(&cfg.TemplateStr, "template", "", "If present, parse this string as a golang template and use it for output printing")

-	flag.StringVar(&cfg.ClientConfig.CAFile, "certificate_authority", "", "Path to a cert. file for the certificate authority")

-	flag.StringVar(&cfg.ClientConfig.CertFile, "client_certificate", "", "Path to a client certificate for TLS.")

-	flag.StringVar(&cfg.ClientConfig.KeyFile, "client_key", "", "Path to a client key file for TLS.")

-	flag.BoolVar(&cfg.ClientConfig.Insecure, "insecure_skip_tls_verify", false, "If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.")

-	flag.StringVar(&cfg.ImageName, "image", "", "Image used when updating a replicationController.  Will apply to the first container in the pod template.")

-	flag.StringVar(&cfg.ID, "id", "", "Specifies ID of requested resource.")

-	flag.StringVar(&cfg.ns, "ns", "", "If present, the namespace scope for this request.")

-	flag.StringVar(&cfg.nsFile, "ns_file", os.Getenv("HOME")+"/.kubernetes_ns", "Path to the namespace file")

-	flag.StringVar(&cfg.BuildConfigID, "from-build-cfg", "", "Specifies BuildConfigID from which the build should be created.")

-	// this is handy for end to end testing

-	flag.StringVar(&cfg.ClientConfig.BearerToken, "token", "", "If present, the bearer token for this request.")

-

-	return cmd

-}

deleted file mode 100644

@@ -1,4 +0,0 @@

-// Package client contains the implementation of the client side communication with the

-// Kubernetes master. OpenShift currently embeds the Kubernetes's kubecfg command line

-// for prototyping and debugging.

-package client

deleted file mode 100644

@@ -1,57 +0,0 @@

-package image

-

-import (

-	"fmt"

-	"io"

-	"strings"

-

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

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

-)

-

-var imageColumns = []string{"Name", "Docker Ref"}

-var imageRepositoryColumns = []string{"Name", "Docker Repo", "Tags"}

-

-// RegisterPrintHandlers registers HumanReadablePrinter handlers for image and image repository resources.

-func RegisterPrintHandlers(printer *kubecfg.HumanReadablePrinter) {

-	printer.Handler(imageColumns, printImage)

-	printer.Handler(imageColumns, printImageList)

-	printer.Handler(imageRepositoryColumns, printImageRepository)

-	printer.Handler(imageRepositoryColumns, printImageRepositoryList)

-}

-

-func printImage(image *api.Image, w io.Writer) error {

-	_, err := fmt.Fprintf(w, "%s\t%s\n", image.Name, image.DockerImageReference)

-	return err

-}

-

-func printImageList(images *api.ImageList, w io.Writer) error {

-	for _, image := range images.Items {

-		if err := printImage(&image, w); err != nil {

-			return err

-		}

-	}

-	return nil

-}

-

-func printImageRepository(repo *api.ImageRepository, w io.Writer) error {

-	tags := ""

-	if len(repo.Tags) > 0 {

-		var t []string

-		for tag := range repo.Tags {

-			t = append(t, tag)

-		}

-		tags = strings.Join(t, ",")

-	}

-	_, err := fmt.Fprintf(w, "%s\t%s\t%s\n", repo.Name, repo.DockerImageRepository, tags)

-	return err

-}

-

-func printImageRepositoryList(repos *api.ImageRepositoryList, w io.Writer) error {

-	for _, repo := range repos.Items {

-		if err := printImageRepository(&repo, w); err != nil {

-			return err

-		}

-	}

-	return nil

-}

deleted file mode 100644

@@ -1,26 +0,0 @@

-package client

-

-import (

-	"encoding/json"

-	"fmt"

-	"io"

-)

-

-// JSONPrinter is an implementation of ResourcePrinter which parsess raw JSON, and

-// re-formats as indented, human-readable JSON.

-type JSONPrinter struct{}

-

-// Print parses the data as JSON, re-formats as JSON and prints the indented

-// JSON.

-func (y *JSONPrinter) Print(data []byte, w io.Writer) error {

-	var obj interface{}

-	if err := json.Unmarshal(data, &obj); err != nil {

-		return err

-	}

-	output, err := json.MarshalIndent(obj, "", "  ")

-	if err != nil {

-		return err

-	}

-	_, err = fmt.Fprint(w, string(output))

-	return err

-}

deleted file mode 100644

@@ -1,629 +0,0 @@

-package client

-

-import (

-	"fmt"

-	"io"

-	"io/ioutil"

-	"net/http"

-	"net/url"

-	"os"

-	"reflect"

-	"sort"

-	"strconv"

-	"strings"

-	"time"

-

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

-	klatest "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"

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

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

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

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

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

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

-	"github.com/golang/glog"

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

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

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

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

-	. "github.com/openshift/origin/pkg/cmd/client/api"

-	"github.com/openshift/origin/pkg/cmd/client/build"

-	"github.com/openshift/origin/pkg/cmd/client/image"

-	"github.com/openshift/origin/pkg/cmd/client/project"

-	"github.com/openshift/origin/pkg/cmd/client/route"

-	configapi "github.com/openshift/origin/pkg/config/api"

-	deployapi "github.com/openshift/origin/pkg/deploy/api"

-	deployclient "github.com/openshift/origin/pkg/deploy/client"

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

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

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

-)

-

-type KubeConfig struct {

-	ClientConfig   kclient.Config

-	ServerVersion  bool

-	PreventSkew    bool

-	Config         string

-	TemplateConfig string

-	Selector       string

-	UpdatePeriod   time.Duration

-	PortSpec       string

-	ServicePort    int

-	AuthConfig     string

-	JSON           bool

-	YAML           bool

-	Verbose        bool

-	Proxy          bool

-	WWW            string

-	TemplateFile   string

-	TemplateStr    string

-	ID             string

-	Namespace      string

-	BuildConfigID  string

-

-	ImageName string

-

-	APIVersion   string

-	OSAPIVersion string

-

-	Args   []string

-	ns     string

-	nsFile string

-}

-

-func (c *KubeConfig) Arg(index int) string {

-	if index >= len(c.Args) {

-		return ""

-	}

-	return c.Args[index]

-}

-

-func usage(name string) string {

-	return fmt.Sprintf(`

-  Kubernetes REST API:

-  %[1]s [OPTIONS] get|list|create|delete|update <%[2]s>[/<id>]

-

-  Manage replication controllers:

-

-  %[1]s [OPTIONS] stop|rm <controller>

-  %[1]s [OPTIONS] [-u <time>] [-image <image>] rollingupdate <controller>

-  %[1]s [OPTIONS] resize <controller> <replicas>

-

-  Launch a simple ReplicationController with a single container based

-  on the given image:

-

-  %[1]s [OPTIONS] [-p <port spec>] run <image> <replicas> <controller>

-

-  Manage namespace:

-  %[1]s [OPTIONS] ns [<namespace>]

-

-  Perform bulk operations on groups of Kubernetes resources:

-  %[1]s [OPTIONS] apply -c config.json

-

-  Process template into config:

-  %[1]s [OPTIONS] process -c template.json

-

-  Retrieve build logs:

-  %[1]s [OPTIONS] buildLogs --id="buildID"

-`, name, prettyWireStorage())

-}

-

-var parser = kubecfg.NewParser(map[string]runtime.Object{

-	"pods":                    &api.Pod{},

-	"services":                &api.Service{},

-	"replicationControllers":  &api.ReplicationController{},

-	"minions":                 &api.Node{},

-	"nodes":                   &api.Node{},

-	"builds":                  &buildapi.Build{},

-	"buildConfigs":            &buildapi.BuildConfig{},

-	"images":                  &imageapi.Image{},

-	"imageRepositories":       &imageapi.ImageRepository{},

-	"imageRepositoryMappings": &imageapi.ImageRepositoryMapping{},

-	"config":                  &configapi.Config{},

-	"deployments":             &deployapi.Deployment{},

-	"deploymentConfigs":       &deployapi.DeploymentConfig{},

-	"routes":                  &routeapi.Route{},

-	"projects":                &projectapi.Project{},

-})

-

-func prettyWireStorage() string {

-	types := parser.SupportedWireStorage()

-	sort.Strings(types)

-	return strings.Join(types, "|")

-}

-

-// readConfigData reads the bytes from the specified filesytem or network location associated with the *config flag

-func (c *KubeConfig) readConfigData() []byte {

-	// read from STDIN

-	if c.Config == "-" {

-		data, err := ioutil.ReadAll(os.Stdin)

-		if err != nil {

-			glog.Fatalf("Unable to read from STDIN: %v\n", err)

-		}

-		return data

-	}

-

-	// we look for http:// or https:// to determine if valid URL, otherwise do normal file IO

-	if url, err := url.Parse(c.Config); err == nil && (url.Scheme == "http" || url.Scheme == "https") {

-		resp, err := http.Get(url.String())

-		if err != nil {

-			glog.Fatalf("Unable to access URL %v: %v\n", c.Config, err)

-		}

-		defer resp.Body.Close()

-		if resp.StatusCode != 200 {

-			glog.Fatalf("Unable to read URL, server reported %d %s", resp.StatusCode, resp.Status)

-		}

-		data, err := ioutil.ReadAll(resp.Body)

-		if err != nil {

-			glog.Fatalf("Unable to read URL %v: %v\n", c.Config, err)

-		}

-		return data

-	}

-

-	data, err := ioutil.ReadFile(c.Config)

-	if err != nil {

-		glog.Fatalf("Unable to read %v: %v\n", c.Config, err)

-	}

-	return data

-}

-

-// readConfig reads and parses pod, replicationController, and service

-// configuration files. If any errors log and exit non-zero.

-func (c *KubeConfig) readConfig(storage string, serverCodec runtime.Codec) []byte {

-	if len(c.Config) == 0 {

-		glog.Fatal("Need config file (-c)")

-	}

-

-	data, err := parser.ToWireFormat(c.readConfigData(), storage, latest.Codec, serverCodec)

-	if err != nil {

-		glog.Fatalf("Error parsing %v as an object for %v: %v", c.Config, storage, err)

-	}

-	if c.Verbose {

-		glog.Infof("Parsed config file successfully; sending:\n%v", string(data))

-	}

-	return data

-}

-

-// getNamespace returns the effective namespace for this invocation based on the first of:

-// 1.  The --ns argument

-// 2.  The contents of the nsFile

-// 3.  Uses the default namespace

-func (c *KubeConfig) getNamespace() string {

-	// Load namespace information for requests

-	nsInfo, err := kubecfg.LoadNamespaceInfo(c.nsFile)

-	if err != nil {

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

-	}

-	ret := nsInfo.Namespace

-

-	// Check if the namespace was overriden by the -ns argument

-	if len(c.ns) > 0 {

-		ret = c.ns

-	}

-

-	return ret

-}

-

-func (c *KubeConfig) Run() {

-	util.InitLogs()

-	defer util.FlushLogs()

-

-	clientConfig := c.ClientConfig

-	// Initialize the client

-	if clientConfig.Host == "" {

-		clientConfig.Host = os.Getenv("KUBERNETES_MASTER")

-	}

-	if clientConfig.Host == "" {

-		// TODO: eventually apiserver should start on 443 and be secure by default

-		clientConfig.Host = "http://localhost:8080"

-	}

-	hosts := strings.SplitN(clientConfig.Host, ",", 2)

-	for i := range hosts {

-		hosts[i] = strings.TrimRight(hosts[i], "/")

-	}

-	clientConfig.Host = hosts[0]

-

-	if kclient.IsConfigTransportTLS(clientConfig) {

-		auth, err := kubecfg.LoadClientAuthInfoOrPrompt(c.AuthConfig, os.Stdin)

-		if err != nil {

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

-		}

-		clientConfig.Username = auth.User

-		clientConfig.Password = auth.Password

-		if auth.CAFile != "" {

-			clientConfig.CAFile = auth.CAFile

-		}

-		if auth.CertFile != "" {

-			clientConfig.CertFile = auth.CertFile

-		}

-		if auth.KeyFile != "" {

-			clientConfig.KeyFile = auth.KeyFile

-		}

-		if len(clientConfig.BearerToken) == 0 && auth.BearerToken != "" {

-			clientConfig.BearerToken = auth.BearerToken

-		}

-		if auth.Insecure != nil {

-			clientConfig.Insecure = *auth.Insecure

-		}

-	}

-	clientConfig.Version = c.APIVersion

-	kubeClient, err := kclient.New(&clientConfig)

-	if err != nil {

-		glog.Fatalf("Unable to set up the Kubernetes API client: %v", err)

-	}

-

-	if len(hosts) > 1 {

-		clientConfig.Host = hosts[1]

-	}

-	clientConfig.Version = c.OSAPIVersion

-	client, err := osclient.New(&clientConfig)

-	if err != nil {

-		glog.Fatalf("Unable to set up the OpenShift API client: %v", err)

-	}

-

-	// check the kubernetes server version

-	if c.ServerVersion {

-		got, err := kubeClient.ServerVersion()

-		if err != nil {

-			fmt.Printf("Couldn't read version from server: %v", err)

-			os.Exit(1)

-		}

-		fmt.Printf("Server Version: %#v", got)

-		os.Exit(0)

-	}

-

-	if c.PreventSkew {

-		got, err := kubeClient.ServerVersion()

-		if err != nil {

-			fmt.Printf("Couldn't read version from server: %v", err)

-			os.Exit(1)

-		}

-		if c, s := version.Get(), *got; !reflect.DeepEqual(c, s) {

-			fmt.Printf("Server version (%#v) differs from client version (%#v)!", s, c)

-			os.Exit(1)

-		}

-	}

-

-	if c.Proxy {

-		glog.Info("Starting to serve on localhost:8001")

-		server, err := kubecfg.NewProxyServer(c.WWW, &clientConfig)

-		if err != nil {

-			glog.Fatalf("Unable to initialize proxy server %v", err)

-		}

-		glog.Fatal(server.Serve())

-	}

-

-	method := c.Arg(0)

-	clients := ClientMappings{

-		"minions":                 {"Minion", kubeClient.RESTClient, klatest.Codec},

-		"pods":                    {"Pod", kubeClient.RESTClient, klatest.Codec},

-		"services":                {"Service", kubeClient.RESTClient, klatest.Codec},

-		"replicationControllers":  {"ReplicationController", kubeClient.RESTClient, klatest.Codec},

-		"builds":                  {"Build", client.RESTClient, latest.Codec},

-		"buildConfigs":            {"BuildConfig", client.RESTClient, latest.Codec},

-		"images":                  {"Image", client.RESTClient, latest.Codec},

-		"imageRepositories":       {"ImageRepository", client.RESTClient, latest.Codec},

-		"imageRepositoryMappings": {"ImageRepositoryMapping", client.RESTClient, latest.Codec},

-		"deployments":             {"Deployment", client.RESTClient, latest.Codec},

-		"deploymentConfigs":       {"DeploymentConfig", client.RESTClient, latest.Codec},

-		"routes":                  {"Route", client.RESTClient, latest.Codec},

-		"projects":                {"Project", client.RESTClient, latest.Codec},

-	}

-

-	matchFound := c.executeConfigRequest(method, clients) || c.executeBuildRequest(method, client) || c.executeTemplateRequest(method, client) || c.executeBuildLogRequest(method, client) || c.executeControllerRequest(method, kubeClient) || c.executeNamespaceRequest(method) || c.executeAPIRequest(method, clients)

-	if matchFound == false {

-		glog.Fatalf("Unknown command %s", method)

-	}

-}

-

-// storagePathFromArg normalizes a path and breaks out the first segment if available

-func storagePathFromArg(arg string) (storage, path string, hasSuffix bool) {

-	path = strings.Trim(arg, "/")

-	segments := strings.SplitN(path, "/", 2)

-	storage = segments[0]

-	if len(segments) > 1 && segments[1] != "" {

-		hasSuffix = true

-	}

-	return storage, path, hasSuffix

-}

-

-//checkStorage returns true if the provided storage is valid

-func checkStorage(storage string) bool {

-	for _, allowed := range parser.SupportedWireStorage() {

-		if allowed == storage {

-			return true

-		}

-	}

-	return false

-}

-

-func (c *KubeConfig) executeAPIRequest(method string, clients ClientMappings) bool {

-	storage, path, hasSuffix := storagePathFromArg(c.Arg(1))

-	validStorage := checkStorage(storage)

-	client, ok := clients[storage]

-	if !ok {

-		glog.Fatalf("Unsupported storage type %s", storage)

-	}

-

-	verb := ""

-	setBody := false

-	var version string

-	switch method {

-	case "get":

-		verb = "GET"

-		if !validStorage || !hasSuffix {

-			glog.Fatalf("usage: kubecfg [OPTIONS] %s <%s>[/<id>]", method, prettyWireStorage())

-		}

-	case "list":

-		verb = "GET"

-		if !validStorage || hasSuffix {

-			glog.Fatalf("usage: kubecfg [OPTIONS] %s <%s>", method, prettyWireStorage())

-		}

-	case "delete":

-		verb = "DELETE"

-		if !validStorage || !hasSuffix {

-			glog.Fatalf("usage: kubecfg [OPTIONS] %s <%s>/<id>", method, prettyWireStorage())

-		}

-	case "create":

-		verb = "POST"

-		setBody = true

-		if !validStorage || hasSuffix {

-			glog.Fatalf("usage: kubecfg [OPTIONS] %s <%s>", method, prettyWireStorage())

-		}

-	case "update":