Ssh docs/examples , PR template update (#1446)

* Fix -> remove the dash, valid names are master0,master1,master2, but not master-0,master-1,master-2
* Add more information, show example with nodes, show multiple ways to ssh to a worker node
* Change VSTS to ADO because that is the tool we use now
* Add an additional example of connecting to a worker
* respected->respective, english is hard
This commit is contained in:
Ross Bryan 2021-04-19 06:36:36 -04:00 коммит произвёл GitHub
Родитель e86474f6a8
Коммит f4aa7c1577
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 22 добавлений и 7 удалений

4
.github/PULL_REQUEST_TEMPLATE.md поставляемый
Просмотреть файл

@ -1,7 +1,7 @@
### Which issue this PR addresses:
<!--
Please include a link to the VSTS work item as well as any GitHub issues.
Please include a link to the ADO work item as well as any GitHub issues.
Usage: `Fixes #<GitHub issue number>`, or `Fixes (paste link of issue)`.
-->
@ -29,7 +29,7 @@ How did you test that this PR works?
<!--
- If yes and the docs are in GitHub, include doc updates in the PR.
- If yes and the docs are not in GitHub (i.e. VSTS wiki), include a link to the
- If yes and the docs are not in GitHub (i.e. ADO wiki), include a link to the
docs.
- If no, explain why (e.g. "tech debt cleanup, N/A").
-->

Просмотреть файл

@ -206,13 +206,28 @@
* "SSH" to a cluster node:
* First, get the admin kubeconfig and `export KUBECONFIG` as detailed above.
* Get the admin kubeconfig and `export KUBECONFIG` as detailed above.
* Run the ssh-agent.sh script. This takes the argument is the name of the NIC attached to the VM you are trying to ssh to.
* Given the following nodes these commands would be used to connect to the respective node
```bash
CLUSTER=cluster hack/ssh-agent.sh [master-{0,1,2}]
```
```
$ oc get nodes
NAME STATUS ROLES AGE VERSION
aro-dev-abc123-master-0 Ready master 47h v1.19.0+2f3101c
aro-dev-abc123-master-1 Ready master 47h v1.19.0+2f3101c
aro-dev-abc123-master-2 Ready master 47h v1.19.0+2f3101c
aro-dev-abc123-worker-eastus1-2s5rb Ready worker 47h v1.19.0+2f3101c
aro-dev-abc123-worker-eastus2-php82 Ready worker 47h v1.19.0+2f3101c
aro-dev-abc123-worker-eastus3-cbqs2 Ready worker 47h v1.19.0+2f3101c
CLUSTER=cluster hack/ssh-agent.sh master0 # master node aro-dev-abc123-master-0
CLUSTER=cluster hack/ssh-agent.sh aro-dev-abc123-worker-eastus1-2s5rb # worker aro-dev-abc123-worker-eastus1-2s5rb
CLUSTER=cluster hack/ssh-agent.sh eastus1 # worker aro-dev-abc123-worker-eastus1-2s5rb
CLUSTER=cluster hack/ssh-agent.sh 2s5rb # worker aro-dev-abc123-worker-eastus1-2s5rb
CLUSTER=cluster hack/ssh-agent.sh bootstrap # the bootstrap node used to provision cluster
```
### Metrics
To run fake metrics socket:

Просмотреть файл

@ -7,11 +7,11 @@
usage() {
echo "usage: CLUSTER=cluster $0 hostname_pattern" >&2
echo " Examples: CLUSTER=cluster $0 master1" >&2
echo " CLUSTER=cluster $0 eastus1 # worker node 1" >&2
echo " CLUSTER=cluster $0 bootstrap" >&2
exit 1
}
if [[ "$#" -ne 1 ]]; then
usage
fi