Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #14832 Mention anything as password during cluster up #14861

Merged
merged 1 commit into from
Jun 30, 2017
Merged

Fix #14832 Mention anything as password during cluster up #14861

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions pkg/bootstrap/docker/up.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ var (
"rhel7": "examples/image-streams/image-streams-rhel7.json",
}

// defaultImageStreams is the default key for the above imageStreams
// mapping. It should be set during build via -ldflags.
// defaultImageStreams is the default key for the above imageStreams mapping.
// It should be set during build via -ldflags.
defaultImageStreams string

templateLocations = map[string]string{
Expand Down Expand Up @@ -126,7 +126,7 @@ var (
openshiftVersion36alpha2 = semver.MustParse("3.6.0-alpha.2+3c221d5")
)

// NewCmdUp creates a command that starts openshift on Docker with reasonable defaults
// NewCmdUp creates a command that starts OpenShift on Docker with reasonable defaults
func NewCmdUp(name, fullName string, f *osclientcmd.Factory, out, errout io.Writer) *cobra.Command {
config := &ClientStartConfig{
CommonStartConfig: CommonStartConfig{
Expand Down Expand Up @@ -308,8 +308,8 @@ func (c *CommonStartConfig) Complete(f *osclientcmd.Factory, cmd *cobra.Command)

c.addTask(conditionalTask("Create Docker machine", c.CreateDockerMachine, func() bool { return c.ShouldCreateDockerMachine }))
// Get a Docker client.
// If a Docker machine was specified, make sure that the machine is
// running. Otherwise, use environment variables.
// If a Docker machine was specified, make sure that the machine is running.
// Otherwise, use environment variables.
c.addTask(simpleTask("Checking Docker client", c.GetDockerClient))

// Check that we have the minimum Docker version available to run OpenShift
Expand All @@ -319,14 +319,14 @@ func (c *CommonStartConfig) Complete(f *osclientcmd.Factory, cmd *cobra.Command)
// If one exists but not running, delete it.
c.addTask(simpleTask("Checking for existing OpenShift container", c.CheckExistingOpenShiftContainer))

// Ensure that the OpenShift Docker image is available. If not present,
// pull it.
// Ensure that the OpenShift Docker image is available.
// If not present, pull it.
t := simpleTask(fmt.Sprintf("Checking for %s image", c.openshiftImage()), c.CheckOpenShiftImage)
t.stdOut = true
c.addTask(t)

// Ensure that the Docker daemon has the right --insecure-registry argument. If
// not, then exit.
// Ensure that the Docker daemon has the right --insecure-registry argument.
// If not, then exit.
if !c.SkipRegistryCheck {
c.addTask(simpleTask("Checking Docker daemon configuration", c.CheckDockerInsecureRegistry))
}
Expand Down Expand Up @@ -616,9 +616,9 @@ func getDockerClient(out io.Writer, dockerMachine string, canStartDockerMachine
return dockerhelper.NewClient(host, engineAPIClient), nil
}

// CheckExistingOpenShiftContainer checks the state of an OpenShift container. If one
// is already running, it throws an error. If one exists, it removes it so a new one
// can be created.
// CheckExistingOpenShiftContainer checks the state of an OpenShift container.
// If one is already running, it throws an error.
// If one exists, it removes it so a new one can be created.
func (c *CommonStartConfig) CheckExistingOpenShiftContainer(out io.Writer) error {
container, running, err := c.DockerHelper().GetContainerState(openshift.OpenShiftContainer)
if err != nil {
Expand All @@ -637,8 +637,8 @@ func (c *CommonStartConfig) CheckExistingOpenShiftContainer(out io.Writer) error
return nil
}

// CheckOpenShiftImage checks whether the OpenShift image exists. If not it tells the
// Docker daemon to pull it.
// CheckOpenShiftImage checks whether the OpenShift image exists.
// If not it tells the Docker daemon to pull it.
func (c *CommonStartConfig) CheckOpenShiftImage(out io.Writer) error {
return c.DockerHelper().CheckAndPull(c.openshiftImage(), out)
}
Expand All @@ -655,8 +655,8 @@ func (c *CommonStartConfig) CheckDockerInsecureRegistry(out io.Writer) error {
return nil
}

// CheckNsenterMounter checks whether the Docker host can use the nsenter mounter from Kubernetes. Otherwise,
// a shared volume is needed in Docker
// CheckNsenterMounter checks whether the Docker host can use the nsenter mounter from Kubernetes.
// Otherwise, a shared volume is needed in Docker
func (c *CommonStartConfig) CheckNsenterMounter(out io.Writer) error {
var err error
c.UseNsenterMount, err = c.HostHelper().CanUseNsenterMounter()
Expand Down Expand Up @@ -783,8 +783,7 @@ func (c *CommonStartConfig) DetermineServerIP(out io.Writer) error {
return nil
}

// updateNoProxy will add some default values to the NO_PROXY setting
// if they are not present
// updateNoProxy will add some default values to the NO_PROXY setting if they are not present
func (c *ClientStartConfig) updateNoProxy() {
values := []string{"127.0.0.1", c.ServerIP, "localhost", openshift.RegistryServiceIP, openshift.ServiceCatalogServiceIP, "172.30.0.0/8"}
ipFromServer, err := c.OpenShiftHelper().ServerIP()
Expand Down Expand Up @@ -999,7 +998,7 @@ func (c *ClientStartConfig) InstallMetrics(out io.Writer) error {
return c.OpenShiftHelper().InstallMetrics(f, openshift.MetricsHost(c.RoutingSuffix, c.ServerIP), c.Image, c.ImageVersion)
}

// CheckServiceCatalogPrereqVersion ensures the openshift server version is high enough to
// CheckServiceCatalogPrereqVersion ensures the OpenShift server version is high enough to
// run the service catalog.
func (c *ClientStartConfig) CheckServiceCatalogPrereqVersion(out io.Writer) error {
serverVersion, _ := c.OpenShiftHelper().ServerPrereleaseVersion()
Expand Down Expand Up @@ -1073,7 +1072,8 @@ func (c *ClientStartConfig) ServerInfo(out io.Writer) error {

if c.ShouldCreateUser() {
msg += fmt.Sprintf("You are logged in as:\n"+
" User: %s\n\n", initialUser)
" User: %s\n"+
" Password: <any value>\n\n", initialUser)
msg += "To login as administrator:\n" +
" oc login -u system:admin\n\n"
}
Expand Down