Merge pull request #19227 from praveenkumar/issue_19226

Issue #19226 Removed docker machine doc from cluster up usage message

Author: openshift-merge-robot

docs/cluster_up_down.md

@@ -174,18 +174,11 @@ and download a [compatible version of Docker](#prerequisites).
 4. Create a new docker machine named `openshift` with appropriate resource constraints. See [Getting Started with Docker Machine](https://docs.docker.com/machine/get-started/#create-a-machine) for instructions.
 5. Open Terminal and run
    ```
-   $ oc cluster up --docker-machine=openshift
+   $ docker-machine create openshift
+   $ docker-machine start openshift
    ```
 
-   OpenShift will start cluster on the docker machine you specified.
-
-To stop the cluster, run:
-
-```
-$ oc cluster down --docker-machine=openshift
-```
-
-To start/stop OpenShift again, either:
+To start/stop OpenShift cluster:
 
 * Setup the Docker environment for the machine you wish to use, and then run `oc cluster up` and `oc cluster down`:
 
@@ -198,18 +191,6 @@ To start/stop OpenShift again, either:
   $ oc cluster down
   ```
 
-  OR
-
-* Specify the Docker machine name as an argument to `oc cluster up` and `oc cluster down`:
-
-  ```
-  $ oc cluster up --docker-machine=openshift
-
-  ...
-
-  $ oc cluster down --docker-machine=openshift
-  ```
-
 ### Windows with Docker for Windows
 
 1. Install [Docker for Windows](https://docs.docker.com/docker-for-windows/relase-notes/) making sure you meet the [prerequisites](https://docs.docker.com/docker-for-windows/#/what-to-know-before-you-install)
@@ -252,18 +233,11 @@ and download a [compatible version of Docker](#prerequisites).
 5. Open a Command window as Administrator (for most drivers, docker-machine on Windows requires administrator privileges)
    and run:
    ```
-   C:\> oc cluster up --docker-machine=openshift
+   C:\> docker-machine create openshift
+   C:\> docker-machine start openshift
    ```
 
-  OpenShift will start cluster on the docker machine you specified.
-
-To stop the cluster, run:
-
-```
-C:\> oc cluster down --docker-machine=openshift
-```
-
-To start/stop OpenShift again, either:
+To start/stop OpenShift cluster:
 
 * Setup the Docker environment for the machine you wish to use, and then run `oc cluster up` and `oc cluster down`:
   ```
@@ -275,16 +249,6 @@ To start/stop OpenShift again, either:
   C:\> oc cluster down
   ```
 
-* Specify the Docker machine name as an argument to `oc cluster up` and `oc cluster down`:
-
-  ```
-  C:\> oc cluster up --docker-machine=openshift
-
-  ...
-
-  C:\> oc cluster down --docker-machine=openshift
-  ```
-
 ## Persistent Volumes
 
 (Available starting origin release 1.5.0-alpha.2)

pkg/oc/bootstrap/docker/down.go

@@ -19,17 +19,11 @@ const CmdDownRecommendedName = "down"
 
 var (
 	cmdDownLong = templates.LongDesc(`
-		Stops the container running OpenShift on Docker and associated containers.
-
-		If you started your OpenShift with a specific docker-machine, you need to specify the
-		same machine using the --docker-machine argument.`)
+		Stops the container running OpenShift on Docker and associated containers.`)
 
 	cmdDownExample = templates.Examples(`
 	  # Stop local OpenShift cluster
-	  %[1]s
-
-	  # Stop cluster running on Docker machine 'mymachine'
-	  %[1]s --docker-machine=mymachine`)
+	  %[1]s`)
 )
 
 type ClientStopConfig struct {

pkg/oc/bootstrap/docker/errors/docker.go

@@ -2,7 +2,6 @@ package errors
 
 import (
 	"fmt"
-	"os/exec"
 	"runtime"
 )
 
@@ -11,11 +10,6 @@ func ErrNoDockerClient(err error) error {
 	return NewError("cannot obtain a Docker client").WithCause(err).WithSolution(noDockerClientSolution())
 }
 
-// ErrNoDockerMachineClient is returned when a Docker client cannot be obtained from the given Docker machine
-func ErrNoDockerMachineClient(name string, err error) error {
-	return NewError("cannot obtain a client for Docker machine %q", name).WithCause(err).WithSolution(noDockerMachineClientSolution())
-}
-
 // ErrKubeConfigNotWriteable is returned when the file pointed to by KUBECONFIG cannot be created or written to
 func ErrKubeConfigNotWriteable(file string, err error) error {
 	return NewError("KUBECONFIG is set to a file that cannot be created or modified: %s", file).WithCause(err).WithSolution(kubeConfigSolution())
@@ -41,20 +35,6 @@ Please install Docker tools by following instructions at:
 
 Once installed, run this command with the --create-machine
 argument to create a new Docker machine that will run OpenShift.
-`
-	NoDockerMachineMacSolution = `
-To create a new Docker machine to run OpenShift, run this command again with
-the --create-machine argument. This will create a Docker machine named
-'openshift'.
-
-To use a different machine name, specify the --machine-name=NAME argument.
-
-If you wish to use an existing Docker machine, enable it before running this
-command by executing:
-
-   eval $(docker-machine env NAME)
-
-where NAME is the name of your Docker machine.
 `
 	NoDockerWindowsSolution = `
 Please install Docker tools by following instructions at:
@@ -63,43 +43,18 @@ Please install Docker tools by following instructions at:
 
 Once installed, run this command with the --create-machine argument to create a
 new Docker machine that will run OpenShift.
-`
-	NoDockerMachineWindowsSolution = `
-To create a new Docker machine to run OpenShift, run this command again with
-the --create-machine argument. This will create a Docker machine named
-'openshift'.
-
-To use a different machine name, specify the --machine-name=NAME argument.
-
-If you wish to use an existing Docker machine, enable it before running this
-command by executing:
-
-   docker-machine env
-
-where NAME is the name of your Docker machine.
 `
 	NoDockerLinuxSolution = `
 Ensure that Docker is installed and accessible in your environment.
 Use your package manager or follow instructions at:
 
    https://docs.docker.com/linux/
 `
-
-	NoDockerMachineClientSolution = `
-Ensure that the Docker machine is available and running. You can also create a
-new Docker machine by specifying the --create-machine flag.
-`
-
 	InvalidInsecureRegistryArgSolution = `
 Ensure that the Docker daemon is running with the following argument:
 	--insecure-registry 172.30.0.0/16
 `
 
-	InvalidInsecureRegistryArgSolutionDockerMachine = InvalidInsecureRegistryArgSolution + `
-You can run this command with --create-machine to create a machine with the
-right argument.
-`
-
 	KubeConfigSolutionUnix = `
 You can unset the KUBECONFIG variable to use the default location for it:
    unset KUBECONFIG
@@ -117,37 +72,18 @@ Or you can set its value to a file that can be written to:
 `
 )
 
-func hasDockerMachine() bool {
-	binary := "docker-machine"
-	if runtime.GOOS == "windows" {
-		binary += ".exe"
-	}
-	_, err := exec.LookPath(binary)
-	return err == nil
-}
-
 func noDockerClientSolution() string {
 	switch runtime.GOOS {
 	case "darwin":
-		if hasDockerMachine() {
-			return NoDockerMachineMacSolution
-		}
 		return NoDockerMacSolution
 	case "windows":
-		if hasDockerMachine() {
-			return NoDockerMachineWindowsSolution
-		}
 		return NoDockerWindowsSolution
 	case "linux":
 		return NoDockerLinuxSolution
 	}
 	return fmt.Sprintf("Platform %s is not supported by this command", runtime.GOOS)
 }
 
-func noDockerMachineClientSolution() string {
-	return NoDockerMachineClientSolution
-}
-
 func kubeConfigSolution() string {
 	switch runtime.GOOS {
 	case "windows":
@@ -158,8 +94,5 @@ func kubeConfigSolution() string {
 }
 
 func invalidInsecureRegistryArgSolution() string {
-	if hasDockerMachine() {
-		return InvalidInsecureRegistryArgSolutionDockerMachine
-	}
 	return InvalidInsecureRegistryArgSolution
 }

pkg/oc/bootstrap/docker/status.go

@@ -27,17 +27,11 @@ const CmdStatusRecommendedName = "status"
 
 var (
 	cmdStatusLong = templates.LongDesc(`
-		Show the status of the local OpenShift cluster.
-
-		If you started your OpenShift with a specific docker-machine, you need to specify the
-		same machine using the --docker-machine argument.`)
+		Show the status of the local OpenShift cluster.`)
 
 	cmdStatusExample = templates.Examples(`
 		# See status of local OpenShift cluster
-		%[1]s
-
-		# See status of OpenShift cluster running on Docker machine 'mymachine'
-		%[1]s --docker-machine=mymachine`)
+		%[1]s`)
 )
 
 // NewCmdStatus implements the OpenShift cluster status command.

pkg/oc/cli/cmd/cluster/cluster.go

@@ -27,8 +27,7 @@ var (
 		'join' command on another machine to connect to the first cluster.
 
 		To use an existing Docker connection, ensure that Docker commands are working and that you
-		can create new containers. For OS X and Windows clients, a docker-machine with the VirtualBox
-		driver can be created for you using the --create-machine option.
+		can create new containers.
 
 		By default, etcd data will not be preserved between container restarts. If you wish to
 		preserve your data, specify a value for --host-data-dir and the --use-existing-config flag.