@@ -20,7 +20,7 @@ The OpenShift team periodically publishes binaries to Github on https://github.c

 The tar file for each platform contains a single binary `openshift` which is the all-in-one OpenShift installation.

 * Use `sudo openshift start` to launch the server.  Root access is required to create services due to the need to modify IPTables.  See issue: https://github.com/GoogleCloudPlatform/kubernetes/issues/1859.

-* Use `openshift kubectl -h <server> ...` to connect to an OpenShift server

+* Use `osc -h <server> ...` to connect to an OpenShift server

 * Use `openshift help` to see more about the commands in the binary

 == Develop locally on your host

@@ -80,7 +80,7 @@ Once setup with a Go development environment and Docker, you can:

 3.  In another terminal window, switch to the directory and start an app:

         $ cd $GOPATH/src/github.com/openshift/origin

-        $ _output/local/go/bin/openshift cli create -f examples/hello-openshift/hello-pod.json

+        $ _output/local/go/bin/osc create -f examples/hello-openshift/hello-pod.json

 In your browser, go to [http://localhost:6061](http://localhost:6061) and you should see 'Welcome to OpenShift'.

@@ -1,9 +1,9 @@

-cli command line interface

+osc command line interface

 ==============================

-The `cli` command line tool is used to interact with the [OpenShift](http://openshift.github.io) and [Kubernetes](http://kubernetes.io/) HTTP API(s).

+The `osc` command line tool is used to interact with the [OpenShift](http://openshift.github.io) and [Kubernetes](http://kubernetes.io/) HTTP API(s).

-cli is *verb focused*. The base verbs are *get*, *create*, *delete*,

+osc is *verb focused*. The base verbs are *get*, *create*, *delete*,

 *update* and *describe*. These verbs can be used to manage both Kubernetes and

 OpenShift resources.

@@ -29,7 +29,7 @@ Common Flags

 | --insecure-skip-tls-verify | Skip SSL certificate validation (will make HTTPS insecure) |

 | --help (-h)                | Display help for specified command |

-cli get

+osc get

 -----------

 This command can be used for displaying one or many resources. Possible

@@ -41,10 +41,10 @@ events).

 ### Example Usage

 ```

-$ openshift cli get pods

-$ openshift cli get replicationController 1234-56-7890-234234-456456

-$ openshift cli get service database

-$ openshift cli get -f json pods

+$ osc get pods

+$ osc get replicationController 1234-56-7890-234234-456456

+$ osc get service database

+$ osc get -f json pods

 ```

 ### Output formatting

@@ -66,18 +66,18 @@ Available formats include:

 An example of using `-o template` to retrieve the *name* of the first build:

-`$ openshift cli get builds -o template -t "{{with index .items 0}}{{.metadata.name}}{{end}}"`

+`$ osc get builds -o template -t "{{with index .items 0}}{{.metadata.name}}{{end}}"`

 ### Selectors

-cli `get` provides also 'selectors' that you can use to filter the output

+osc `get` provides also 'selectors' that you can use to filter the output

 by applying key-value pairs that will be matched with the resource labels:

-`$ openshift clic get pods -s template=production`

+`$ osc get pods -s template=production`

 This command will return only pods whose `labels` include `"template": "production"`

-cli create

+osc create

 --------------

 This command can be used to create resources. It does not require pointers about

@@ -87,12 +87,12 @@ After successful creation, the resource name will be printed to the console.

 ### Example Usage

 ```

-$ openshift cli create -f pod.json

-$ cat pod.json | openshift cli create -f -

-$ openshift cli create -f http://server/pod.json

+$ osc create -f pod.json

+$ cat pod.json | osc create -f -

+$ osc create -f http://server/pod.json

 ```

-cli update

+osc update

 ---------------

 This command can be used to update existing resources.

@@ -100,12 +100,12 @@ This command can be used to update existing resources.

 ### Example Usage

 ```

-$ openshift cli update -f pod.json

-$ cat pod.json | openshift cli update -f -

-$ openshift cli update -f http://server/pod.json

+$ osc update -f pod.json

+$ cat pod.json | osc update -f -

+$ osc update -f http://server/pod.json

 ```

-cli delete

+osc delete

 --------------

 This command deletes the resource.

@@ -113,11 +113,11 @@ This command deletes the resource.

 ### Example Usage

 ```

-$ openshift cli delete -f pod.json

-$ openshift cli delete pod 1234-56-7890-234234-456456

+$ osc delete -f pod.json

+$ osc delete pod 1234-56-7890-234234-456456

 ```

-cli describe

+osc describe

 ----------------

 The `describe` command is a wordier version of `get` which also integrates other

@@ -125,60 +125,31 @@ information that's related to a given resource.

 ### Example Usage

-`$ openshift cli describe service frontend`

+`$ osc describe service frontend`

-cli createall

+osc namespace

 -----------------

-This command creates multiple resources defined in JSON or YAML file provided

-using the `-f` option. The list of resources is defined as an 'array'.

-

-### Example Usage

-

-```

-$ openshift cli createall -f resources.json

-$ cat resources.json | openshift cli createall -f -

-```

-

-cli namespace

-

-You can use this command to set the default namespace used for all cli

+You can use this command to set the default namespace used for all osc

 commands.

 ### Example Usage

-`$ openshift cli namespace myuser`

+`$ osc namespace myuser`

-cli log

+osc log

 ------------

 This command dumps the logs from a given Pod container. You can list the

 containers from a Pod using the following command:

-`$ openshift cli get -o yaml pod POD_ID`

-

-### Example Usage

-

-`$ openshift cli log frontend-pod mysql-container`

-

-cli apply

-

-> **NOTE**: This command will be later replaced by upstream (see: [kubectl createall](https://github.com/openshift/origin/blob/master/docs/cli.md#kubectl-createall)).

-

-This command takes a Config resource that defines a list of resources and performs

-create operation on them. Look at [examples/sample-app/docker-registry-config.json](https://github.com/openshift/origin/blob/master/examples/sample-app/docker-registry-config.json).

-

+`$ osc get -o yaml pod POD_ID`

 ### Example Usage

-```

-$ openshift cli apply -f examples/sample-app/docker-registry-config.json

-$ cat config.json | openshift cli apply -f -

-```

+`$ osc log frontend-pod mysql-container`

-cli process

+osc process

 ---------------

 This command processes a Template into a valid Config resource. The processing

@@ -189,11 +160,11 @@ found in [examples/sample-app/application-template-stibuild.json](https://github

 ### Example Usage

 ```

-$ openshift cli process -f sample-app/application-template-stibuild.json > config.json

-$ openshift cli process -f sample-app/application-template-stibuild.json | openshift cli apply -f -

+$ osc process -f examples/guestbook/template.json > config.json

+$ osc process -f template.json | osc create -f -

 ```

-cli build-logs

+osc build-logs

 ------------------

 > **NOTE**: This command will be later replaced by upstream (see: [kubectl log](https://github.com/openshift/origin/blob/master/docs/cli.md#kubectl-log)).

@@ -202,8 +173,8 @@ This command will retrieve the logs from a Build container. It allows you to

 debug broken Build. If the build is still running, this command can stream the

 logs from the container to console. You can obtain a list of builds by using:

-`$ openshift cli get builds`

+`$ osc get builds`

 ### Example Usage

-`$ openshift cli build-logs rubyapp-build`

+`$ osc build-logs rubyapp-build`

@@ -8,7 +8,7 @@ System Environment

 1. Run as root

-   Currently OpenShift v3 must be started as root in order to manipulate your iptables configuration.  The openshift commands (e.g. `openshift kubectl apply`) do not need to be run as root.

+   Currently OpenShift v3 must be started as root in order to manipulate your iptables configuration.  The openshift commands (e.g. `osc create`) do not need to be run as root.

 1. Properly configure or disable firewalld

@@ -30,11 +30,11 @@ Build Failures

 To investigate a build failure, first check the build logs.  You can view the build logs via

-    $ openshift kubectl build-logs [build_id]

+    $ osc build-logs [build_id]

 and you can get the build id via:

-    $ openshift kubectl get builds

+    $ osc get builds

 the build id is in the first column.

@@ -53,11 +53,11 @@ Docker Registry

 Most of the v3 flows today assume you are running a docker registry pod.  You should ensure that this local registry is running:

-    $ openshift kubectl get services | grep registry

+    $ osc get pods --selector="name=registrypod"

 If it's not running, you can launch it via:

-    $ openshift kubectl apply -f examples/sample-app/docker-registry-config.json

+    $ osc create -f examples/sample-app/docker-registry-config.json

 In addition, confirm the IP and Port reported in the services list matches the registry references in your configuration json (e.g. any image tags that contain a registry hostname).  

@@ -31,7 +31,7 @@ Once it is pulled it will start and be visible in the `docker ps` list of contai

     [vagrant@openshiftdev origin]$ export PATH=/data/src/github.com/openshift/origin/_output/local/bin/linux/amd64:$PATH

     [vagrant@openshiftdev origin]$ sudo /data/src/github.com/openshift/origin/_output/local/bin/linux/amd64/openshift start &

-    If running in https mode, ensure openshift cli can authenticate

+    If running in https mode, ensure osc can authenticate

     [vagrant@openshiftdev origin]$ sudo chmod a+r openshift.local.certificates/admin/*

     [vagrant@openshiftdev origin]$ export KUBECONFIG=/data/src/github.com/openshift/origin/openshift.local.certificates/admin/.kubeconfig

@@ -39,7 +39,7 @@ Once it is pulled it will start and be visible in the `docker ps` list of contai

     [vagrant@openshiftdev origin]$ export OPENSHIFT_CA_DATA=$(<$CERT_DIR/master/root.crt)

     [vagrant@openshiftdev origin]$ hack/install-router.sh {router_id} {master_url}

-    [vagrant@openshiftdev origin]$ openshift cli get pods

+    [vagrant@openshiftdev origin]$ osc get pods

 #### Clustered vagrant environment

@@ -62,7 +62,7 @@ In order to run the router in a deployed environment the following conditions mu

 To install the router pod you use the `hack/install-router.sh` script, passing it the router id, master url, and, optionally,

 the OpenShift executable.  If the executable is not passed the script will try to find it via the `PATH`.  If the

 script is still unable to find the OpenShift executable then it will simply create the `/tmp/router.json` file and stop.

-It is then up to the user to issue the `openshift cli create` command manually.

+It is then up to the user to issue the `osc create` command manually.

 ### Manually   

@@ -86,19 +86,19 @@ To test your route independent of DNS you can send a host header to the router.

     $ ..... vagrant up with single machine instructions .......

     $ ..... create config files listed below in ~ ........

-    [vagrant@openshiftdev origin]$ openshift cli create -f ~/pod.json

-    [vagrant@openshiftdev origin]$ openshift cli create -f ~/service.json

-    [vagrant@openshiftdev origin]$ openshift cli create -f ~/route.json

+    [vagrant@openshiftdev origin]$ osc create -f ~/pod.json

+    [vagrant@openshiftdev origin]$ osc create -f ~/service.json

+    [vagrant@openshiftdev origin]$ osc create -f ~/route.json

     [vagrant@openshiftdev origin]$ curl -H "Host:hello-openshift.v3.rhcloud.com" <vm ip>

     Hello OpenShift!

     $ ..... vagrant up with cluster instructions .....

     $ ..... create config files listed below in ~ ........

-    [vagrant@openshift-master ~]$ openshift cli create -f ~/pod.json

-    [vagrant@openshift-master ~]$ openshift cli create -f ~/service.json

-    [vagrant@openshift-master ~]$ openshift cli create -f ~/route.json

+    [vagrant@openshift-master ~]$ osc create -f ~/pod.json

+    [vagrant@openshift-master ~]$ osc create -f ~/service.json

+    [vagrant@openshift-master ~]$ osc create -f ~/route.json

     # take note of what minion number the router is deployed on

-    [vagrant@openshift-master ~]$ openshift cli get pods

+    [vagrant@openshift-master ~]$ osc get pods

     [vagrant@openshift-master ~]$ curl -H "Host:hello-openshift.v3.rhcloud.com" openshift-minion-<1,2>

     Hello OpenShift!

@@ -3,7 +3,7 @@ Hello, OpenShift!

 This example will serve an http response of "Hello Openshift!" to [http://localhost:6061](http://localhost:6061).  To create the pod run:

-        $ openshift cli create -f examples/hello-openshift/hello-pod.json

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

 Contribute

 ----------

@@ -16,31 +16,31 @@ Steps

 2. Start the docker registry services

-        $ openshift kubectl apply -f docker-registry-config.json

+        $ osc create -f docker-registry-config.json

 3. Start the Jenkins services

-        $ openshift kubectl apply -f jenkins-config.json

+        $ osc create -f jenkins-config.json

 4. Determine the IP address of the docker-registry service:

-        $ openshift kubectl get services docker-registry -o template --template="{{ .portalIP }}"

+        $ osc get services docker-registry -o template --template="{{ .portalIP }}"

 5. Edit the application-template.json file by replacing all occurences of `172.30.17.3` with the IP address from the previous step.

 5. Create the application configuration

-        $ openshift kubectl process -f application-template.json | openshift kubectl apply -f -

+        $ osc process -f application-template.json | osc create -f -

 6. Locate the Jenkins service endpoint and go to it in your browser:

-        $ openshift kubectl get services | grep jenkins | awk '{print $4":"$5}'

+        $ osc get services | grep jenkins | awk '{print $4":"$5}'

     Once it is available, proceed to the next step.

 7. Create the Jenkins job named rubyJob:

-        $ JENKINS_ENDPOINT=`openshift kubectl get services | grep jenkins | awk '{print $4":"$5}'`

+        $ JENKINS_ENDPOINT=`osc get services | grep jenkins | awk '{print $4":"$5}'`

         $ cat job.xml | curl -X POST -H "Content-Type: application/xml" -H "Expect: " --data-binary @- http://$JENKINS_ENDPOINT/createItem?name=rubyJob

 8. Run the Jenkins build

@@ -56,5 +56,5 @@ Steps

 10. Confirm both the test and production services are available by browsing to both services:

-        $ openshift kubectl get services | grep frontend

+        $ osc get services | grep frontend

@@ -3,5 +3,5 @@

 # registry service ip+port.  You must have started openshift and deployed

 # the docker-registry service before running this.

 # The new template file produced is template.json.

-REGISTRY_IP=$(openshift cli get services docker-registry -o template --template="{{ .portalIP}}:{{ .port }}")

+REGISTRY_IP=$(osc get services docker-registry -o template --template="{{ .portalIP}}:{{ .port }}")

 sed s/172\.30\.17\.3:5001/$REGISTRY_IP/g application-template-stibuild.json > template.json

@@ -158,7 +158,7 @@ echo "images: ok"

 osc get imageRepositories

 osc create -f test/integration/fixtures/test-image-repository.json

 [ -z "$(osc get imageRepositories test -t "{{.status.dockerImageRepository}}")" ]

-osc apply -f examples/sample-app/docker-registry-config.json

+osc create -f examples/sample-app/docker-registry-config.json

 [ -n "$(osc get imageRepositories test -t "{{.status.dockerImageRepository}}")" ]

 osc delete -f examples/sample-app/docker-registry-config.json

 osc delete imageRepositories test

@@ -193,14 +193,15 @@ osc create -f test/integration/fixtures/test-deployment-config.json

 osc delete deploymentConfigs test-deployment-config

 echo "deploymentConfigs: ok"

-osc process -f test/templates/fixtures/guestbook.json | osc apply -f -

+osc process -f test/templates/fixtures/guestbook.json --parameters --value="ADMIN_USERNAME=admin"

+osc process -f test/templates/fixtures/guestbook.json | osc create -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 -

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

 osc get buildConfigs

 osc get bc

 osc get builds

@@ -212,14 +212,14 @@ docker tag -f centos:centos7 ${DOCKER_REGISTRY_IP}:5001/cached/centos:centos7

 docker push ${DOCKER_REGISTRY_IP}:5001/cached/centos:centos7

 echo "[INFO] Pushed centos7"

-# Process template and apply

+# Process template and create

 echo "[INFO] Submitting application template json for processing..."

 osc process -n test -f examples/sample-app/application-template-stibuild.json > "${STI_CONFIG_FILE}"

 osc process -n docker -f examples/sample-app/application-template-dockerbuild.json > "${DOCKER_CONFIG_FILE}"

 osc process -n custom -f examples/sample-app/application-template-custombuild.json > "${CUSTOM_CONFIG_FILE}"

 echo "[INFO] Applying STI application config"

-osc apply -n test -f "${STI_CONFIG_FILE}"

+osc create -n test -f "${STI_CONFIG_FILE}"

 # Trigger build

 echo "[INFO] Invoking generic web hook to trigger new sti build using curl"

@@ -228,14 +228,14 @@ wait_for_build "test"

 wait_for_app "test"

 #echo "[INFO] Applying Docker application config"

-#osc apply -n docker -f "${DOCKER_CONFIG_FILE}"

+#osc create -n docker -f "${DOCKER_CONFIG_FILE}"

 #echo "[INFO] Invoking generic web hook to trigger new docker build using curl"

 #curl -k -X POST $API_SCHEME://$API_HOST:$API_PORT/osapi/v1beta1/buildConfigHooks/ruby-sample-build/secret101/generic?namespace=docker && sleep 3

 #wait_for_build "docker"

 #wait_for_app "docker"

 #echo "[INFO] Applying Custom application config"

-#osc apply -n custom -f "${CUSTOM_CONFIG_FILE}"

+#osc create -n custom -f "${CUSTOM_CONFIG_FILE}"

 #echo "[INFO] Invoking generic web hook to trigger new custom build using curl"

 #curl -k -X POST $API_SCHEME://$API_HOST:$API_PORT/osapi/v1beta1/buildConfigHooks/ruby-sample-build/secret101/generic?namespace=custom && sleep 3

 #wait_for_build "custom"

@@ -16,7 +16,7 @@ func NewCmdBuildLogs(f *Factory, out io.Writer) *cobra.Command {

 NOTE: This command may be moved in the future.

 Examples:

-$ kubectl build-logs 566bed879d2d

+$ osc build-logs 566bed879d2d

 <stream logs from container to stdout>`,

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

 			if len(args) != 1 {

@@ -25,13 +25,13 @@ func NewCmdCancelBuild(f *Factory, out io.Writer) *cobra.Command {

 Cancels a pending or running build.

 Examples:

-	$ kubectl cancel-build 1da32cvq

+	$ osc cancel-build 1da32cvq

 	<cancel the build with the given name>

-	$ kubectl cancel-build 1da32cvq --dump-logs

+	$ osc cancel-build 1da32cvq --dump-logs

 	<cancel the named build and print the build logs>

-	$kubectl cancel-build 1da32cvq --restart

+	$ osc cancel-build 1da32cvq --restart

 	<cancel the named build and create a new one with the same parameters>`,

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

@@ -37,17 +37,17 @@ func injectUserVars(cmd *cobra.Command, t *api.Template) {

 func NewCmdProcess(f *Factory, out io.Writer) *cobra.Command {

 	cmd := &cobra.Command{

 		Use:   "process -f filename",

-		Short: "Process template into config",

-		Long: `Process template into a config specified in filename or stdin

+		Short: "Process template into list of resources",

+		Long: `Process template into a lis of resources specified in filename or stdin

 JSON and YAML formats are accepted.

 Examples:

-  $ kubectl process -f template.json

-  <convert template.json into Config>

+  $ osc process -f template.json

+  <convert template.json into resource list>

-  $ cat template.json | kubectl process -f -

-  <convert template.json into Config>`,

+  $ cat template.json | osc process -f -

+  <convert template.json into resource list>`,

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

 			filename := kubecmd.GetFlagString(cmd, "filename")

 			if len(filename) == 0 {

@@ -22,10 +22,10 @@ Manually starts build from existing build or buildConfig

 NOTE: This command is experimental and is subject to change in the future.

 Examples:

-  $ kubectl start-build 3bd2ug53b

+  $ osc start-build 3bd2ug53b

   <Starts build from buildConfig matching the name "3bd2ug53b">

-  $ kubectl start-build --from-build=3bd2ug53b

+  $ osc start-build --from-build=3bd2ug53b

   <Starts build from build matching the name "3bd2ug53b">`,

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

 			buildName := kubecmd.GetFlagString(cmd, "from-build")