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

Remove references to --credentials option #3552

Merged
merged 1 commit into from
Jan 20, 2017
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
9 changes: 0 additions & 9 deletions admin_guide/high_availability.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ The list of command options described here are a subset that are relevant to thi

<options> = One or more of:
--create
--credentials=<credentials>
-l,--selector=<selector>
--virtual-ips=<ip-range>
-i|--interface=<interface>
Expand Down Expand Up @@ -561,7 +560,6 @@ ifdef::openshift-enterprise[]
$ oadm router ha-router-us-west --replicas=5 \
--selector="ha-svc-nodes=geo-us-west" \
--labels="ha-svc-nodes=geo-us-west" \
--credentials=/etc/origin/master/openshift-router.kubeconfig \
--service-account=ipfailover
----
====
Expand All @@ -573,7 +571,6 @@ ifdef::openshift-origin[]
$ oadm router ha-router-us-west --replicas=5 \
--selector="ha-svc-nodes=geo-us-west" \
--labels="ha-svc-nodes=geo-us-west" \
--credentials="$KUBECONFIG" \
--service-account=ipfailover
----
====
Expand Down Expand Up @@ -611,7 +608,6 @@ $ oadm ipfailover ipf-ha-router-us-west \
--replicas=5 --watch-port=80 \
--selector="ha-svc-nodes=geo-us-west" \
--virtual-ips="10.245.2.101-105" \
--credentials=/etc/origin/master/openshift-router.kubeconfig \
--iptables-chain="INPUT" \
--service-account=ipfailover --create
----
Expand All @@ -624,7 +620,6 @@ $ oadm ipfailover ipf-ha-router-us-west \
--replicas=5 --watch-port=80 \
--selector="ha-svc-nodes=geo-us-west" \
--virtual-ips="10.245.2.101-105" \
--credentials="$KUBECONFIG" \
--iptables-chain="INPUT" \
--service-account=ipfailover --create
----
Expand All @@ -642,7 +637,6 @@ $ oadm ipfailover ipf-ha-geo-cache \
--replicas=5 --watch-port=9736 \
--selector="ha-svc-nodes=geo-us-west" \
--virtual-ips=10.245.3.101-105 \
--credentials=/etc/origin/master/openshift-router.kubeconfig \
--vrrp-id-offset=10 \
--service-account=ipfailover --create
----
Expand All @@ -655,7 +649,6 @@ $ oadm ipfailover ipf-ha-geo-cache \
--replicas=5 --watch-port=9736 \
--selector="ha-svc-nodes=geo-us-west" \
--virtual-ips=10.245.3.101-105 \
--credentials="$KUBECONFIG" \
--vrrp-id-offset=10 \
--service-account=ipfailover --create
----
Expand Down Expand Up @@ -689,7 +682,6 @@ $ oadm ipfailover ipf-ha-router-us-west \
--replicas=5 --watch-port=80 \
--selector="ha-svc-nodes=geo-us-west" \
--virtual-ips="10.245.2.101-105" \
--credentials=/etc/origin/master/openshift-router.kubeconfig \
--service-account=ipfailover --create
----
====
Expand All @@ -701,7 +693,6 @@ $ oadm ipfailover ipf-ha-router-us-west \
--replicas=5 --watch-port=80 \
--selector="ha-svc-nodes=geo-us-west" \
--virtual-ips="10.245.2.101-105" \
--credentials="$KUBECONFIG" \
--service-account=ipfailover --create
----
====
Expand Down
6 changes: 2 additions & 4 deletions admin_guide/router.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,14 @@ specify *0* as the stats port number.
ifdef::openshift-enterprise[]
====
----
$ oadm router hap --service-account=router --stats-port=0 \
--credentials='/etc/origin/master/openshift-router.kubeconfig'
$ oadm router hap --service-account=router --stats-port=0
----
====
endif::[]
ifdef::openshift-origin[]
====
----
$ oadm router hap --service-account=router --stats-port=0 \
--credentials="$KUBECONFIG"
$ oadm router hap --service-account=router --stats-port=0
----
====
endif::[]
Expand Down
2 changes: 1 addition & 1 deletion cli_reference/admin_cli_operations.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ This specifies:

- An `<action>` to perform, such as `new-project` or `router`.
- An available `<option>` to perform the action on as well as a value for the
option. Options include `--output` or `--credentials`.
option. Options include `--output`.

[[basic-admin-cli-operations]]

Expand Down
2 changes: 1 addition & 1 deletion getting_started/administrators.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ $ oc project default
. Set up an integrated Docker registry for the {product-title} cluster:
+
----
$ oadm registry --credentials=./openshift.local.config/master/openshift-registry.kubeconfig
$ oadm registry
----
+
It will take a few minutes for the registry image to download and start - use
Expand Down
6 changes: 0 additions & 6 deletions install_config/router/f5_router.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ $ oadm router \
--external-host-http-vserver=ose-vserver \
--external-host-https-vserver=https-ose-vserver \
--external-host-private-key=/path/to/key \
--credentials='/etc/origin/master/openshift-router.kubeconfig' \//<1>
--service-account=router
----
====
Expand All @@ -123,15 +122,10 @@ $ oadm router \
--external-host-http-vserver=ose-vserver \
--external-host-https-vserver=https-ose-vserver \
--external-host-private-key=/path/to/key \
--credentials=${ROUTER_KUBECONFIG:-"$KUBECONFIG"} \//<1>
--service-account=router
----
====
endif::[]
<1> `--credentials` is the path to the
xref:../../cli_reference/manage_cli_profiles.adoc#cli-reference-manage-cli-profiles[CLI configuration file]
for the *openshift-router*. It is recommended using an *openshift-router*
specific profile with appropriate permissions.

[[f5-router-partition-paths]]
== F5 Router Partition Paths
Expand Down
2 changes: 1 addition & 1 deletion using_images/xpaas_images/eap.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ The following is a list of prerequisites for using the xPaaS JBoss EAP images:
. *Install and Deploy Docker Registry* - Install the Docker Registry and then ensure that the Docker Registry is deployed to locally manage images as follows:
+
----
$ oadm registry --config=/etc/origin/master/admin.kubeconfig --credentials=/etc/origin/master/openshift-registry.kubeconfig
$ oadm registry --config=/etc/origin/master/admin.kubeconfig
----
+
For further information, see xref:../../install_config/registry/index.adoc#install-config-registry-overview[Deploying a Docker Registry]
Expand Down
3 changes: 1 addition & 2 deletions using_images/xpaas_images/sso.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ The following is a list of prerequisites for using the SSO xPaaS image:
. *Install and Deploy Docker Registry*: Install the Docker Registry and then ensure that the Docker Registry is deployed to locally manage images:
+
----
$ oadm registry --config=/etc/origin/master/admin.kubeconfig \
--credentials=/etc/origin/master/openshift-registry.kubeconfig
$ oadm registry --config=/etc/origin/master/admin.kubeconfig
----
+
For more information, see xref:../../install_config/registry/index.adoc#install-config-registry-overview[Deploying a Docker Registry]
Expand Down