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.

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

Implement cluster status command, fixes #9935 #11171

Merged
merged 1 commit into from
Oct 21, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 46 additions & 0 deletions contrib/completions/bash/oc
Original file line number Diff line number Diff line change
Expand Up @@ -5434,6 +5434,51 @@ _oc_cluster_down()
noun_aliases=()
}

_oc_cluster_status()
{
last_command="oc_cluster_status"
commands=()

flags=()
two_word_flags=()
local_nonpersistent_flags=()
flags_with_completion=()
flags_completion=()

flags+=("--docker-machine=")
local_nonpersistent_flags+=("--docker-machine=")
flags+=("--as=")
flags+=("--certificate-authority=")
flags_with_completion+=("--certificate-authority")
flags_completion+=("_filedir")
flags+=("--client-certificate=")
flags_with_completion+=("--client-certificate")
flags_completion+=("_filedir")
flags+=("--client-key=")
flags_with_completion+=("--client-key")
flags_completion+=("_filedir")
flags+=("--cluster=")
flags+=("--config=")
flags_with_completion+=("--config")
flags_completion+=("_filedir")
flags+=("--context=")
flags+=("--insecure-skip-tls-verify")
flags+=("--log-flush-frequency=")
flags+=("--loglevel=")
flags+=("--logspec=")
flags+=("--match-server-version")
flags+=("--namespace=")
two_word_flags+=("-n")
flags+=("--request-timeout=")
flags+=("--server=")
flags+=("--token=")
flags+=("--user=")

must_have_one_flag=()
must_have_one_noun=()
noun_aliases=()
}

_oc_cluster_up()
{
last_command="oc_cluster_up"
Expand Down Expand Up @@ -5515,6 +5560,7 @@ _oc_cluster()
last_command="oc_cluster"
commands=()
commands+=("down")
commands+=("status")
commands+=("up")

flags=()
Expand Down
47 changes: 47 additions & 0 deletions contrib/completions/bash/openshift
Original file line number Diff line number Diff line change
Expand Up @@ -9994,6 +9994,52 @@ _openshift_cli_cluster_down()
noun_aliases=()
}

_openshift_cli_cluster_status()
{
last_command="openshift_cli_cluster_status"
commands=()

flags=()
two_word_flags=()
local_nonpersistent_flags=()
flags_with_completion=()
flags_completion=()

flags+=("--docker-machine=")
local_nonpersistent_flags+=("--docker-machine=")
flags+=("--as=")
flags+=("--certificate-authority=")
flags_with_completion+=("--certificate-authority")
flags_completion+=("_filedir")
flags+=("--client-certificate=")
flags_with_completion+=("--client-certificate")
flags_completion+=("_filedir")
flags+=("--client-key=")
flags_with_completion+=("--client-key")
flags_completion+=("_filedir")
flags+=("--cluster=")
flags+=("--config=")
flags_with_completion+=("--config")
flags_completion+=("_filedir")
flags+=("--context=")
flags+=("--google-json-key=")
flags+=("--insecure-skip-tls-verify")
flags+=("--log-flush-frequency=")
flags+=("--loglevel=")
flags+=("--logspec=")
flags+=("--match-server-version")
flags+=("--namespace=")
two_word_flags+=("-n")
flags+=("--request-timeout=")
flags+=("--server=")
flags+=("--token=")
flags+=("--user=")

must_have_one_flag=()
must_have_one_noun=()
noun_aliases=()
}

_openshift_cli_cluster_up()
{
last_command="openshift_cli_cluster_up"
Expand Down Expand Up @@ -10076,6 +10122,7 @@ _openshift_cli_cluster()
last_command="openshift_cli_cluster"
commands=()
commands+=("down")
commands+=("status")
commands+=("up")

flags=()
Expand Down
46 changes: 46 additions & 0 deletions contrib/completions/zsh/oc
Original file line number Diff line number Diff line change
Expand Up @@ -5595,6 +5595,51 @@ _oc_cluster_down()
noun_aliases=()
}

_oc_cluster_status()
{
last_command="oc_cluster_status"
commands=()

flags=()
two_word_flags=()
local_nonpersistent_flags=()
flags_with_completion=()
flags_completion=()

flags+=("--docker-machine=")
local_nonpersistent_flags+=("--docker-machine=")
flags+=("--as=")
flags+=("--certificate-authority=")
flags_with_completion+=("--certificate-authority")
flags_completion+=("_filedir")
flags+=("--client-certificate=")
flags_with_completion+=("--client-certificate")
flags_completion+=("_filedir")
flags+=("--client-key=")
flags_with_completion+=("--client-key")
flags_completion+=("_filedir")
flags+=("--cluster=")
flags+=("--config=")
flags_with_completion+=("--config")
flags_completion+=("_filedir")
flags+=("--context=")
flags+=("--insecure-skip-tls-verify")
flags+=("--log-flush-frequency=")
flags+=("--loglevel=")
flags+=("--logspec=")
flags+=("--match-server-version")
flags+=("--namespace=")
two_word_flags+=("-n")
flags+=("--request-timeout=")
flags+=("--server=")
flags+=("--token=")
flags+=("--user=")

must_have_one_flag=()
must_have_one_noun=()
noun_aliases=()
}

_oc_cluster_up()
{
last_command="oc_cluster_up"
Expand Down Expand Up @@ -5676,6 +5721,7 @@ _oc_cluster()
last_command="oc_cluster"
commands=()
commands+=("down")
commands+=("status")
commands+=("up")

flags=()
Expand Down
47 changes: 47 additions & 0 deletions contrib/completions/zsh/openshift
Original file line number Diff line number Diff line change
Expand Up @@ -10155,6 +10155,52 @@ _openshift_cli_cluster_down()
noun_aliases=()
}

_openshift_cli_cluster_status()
{
last_command="openshift_cli_cluster_status"
commands=()

flags=()
two_word_flags=()
local_nonpersistent_flags=()
flags_with_completion=()
flags_completion=()

flags+=("--docker-machine=")
local_nonpersistent_flags+=("--docker-machine=")
flags+=("--as=")
flags+=("--certificate-authority=")
flags_with_completion+=("--certificate-authority")
flags_completion+=("_filedir")
flags+=("--client-certificate=")
flags_with_completion+=("--client-certificate")
flags_completion+=("_filedir")
flags+=("--client-key=")
flags_with_completion+=("--client-key")
flags_completion+=("_filedir")
flags+=("--cluster=")
flags+=("--config=")
flags_with_completion+=("--config")
flags_completion+=("_filedir")
flags+=("--context=")
flags+=("--google-json-key=")
flags+=("--insecure-skip-tls-verify")
flags+=("--log-flush-frequency=")
flags+=("--loglevel=")
flags+=("--logspec=")
flags+=("--match-server-version")
flags+=("--namespace=")
two_word_flags+=("-n")
flags+=("--request-timeout=")
flags+=("--server=")
flags+=("--token=")
flags+=("--user=")

must_have_one_flag=()
must_have_one_noun=()
noun_aliases=()
}

_openshift_cli_cluster_up()
{
last_command="openshift_cli_cluster_up"
Expand Down Expand Up @@ -10237,6 +10283,7 @@ _openshift_cli_cluster()
last_command="openshift_cli_cluster"
commands=()
commands+=("down")
commands+=("status")
commands+=("up")

flags=()
Expand Down
18 changes: 17 additions & 1 deletion docs/generated/oc_by_example_content.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,7 @@ Stop OpenShift on Docker

[options="nowrap"]
----
# Stop local Docker cluster
# Stop local OpenShift cluster
oc cluster down

# Stop cluster running on Docker machine 'mymachine'
Expand All @@ -928,6 +928,22 @@ Stop OpenShift on Docker
====


== oc cluster status
Show OpenShift on Docker status

====

[options="nowrap"]
----
# See status of local OpenShift cluster
oc cluster status

# See status of OpenShift cluster running on Docker machine 'mymachine'
oc cluster status --docker-machine=mymachine
----
====


== oc cluster up
Start OpenShift on Docker with reasonable defaults

Expand Down
1 change: 1 addition & 0 deletions docs/man/man1/.files_generated_oc
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ oc-autoscale.1
oc-build-logs.1
oc-cancel-build.1
oc-cluster-down.1
oc-cluster-status.1
oc-cluster-up.1
oc-cluster.1
oc-completion.1
Expand Down
1 change: 1 addition & 0 deletions docs/man/man1/.files_generated_openshift
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ openshift-cli-autoscale.1
openshift-cli-build-logs.1
openshift-cli-cancel-build.1
openshift-cli-cluster-down.1
openshift-cli-cluster-status.1
openshift-cli-cluster-up.1
openshift-cli-cluster.1
openshift-cli-completion.1
Expand Down
2 changes: 1 addition & 1 deletion docs/man/man1/oc-cluster-down.1
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ If you started your OpenShift with a specific docker\-machine, you need to speci
.RS

.nf
# Stop local Docker cluster
# Stop local OpenShift cluster
oc cluster down

# Stop cluster running on Docker machine 'mymachine'
Expand Down
Loading