Azure
/
ARO-RP
зеркало из https://github.com/Azure/ARO-RP.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Update docs and ssh-agent.sh usage and checks to ensure CLUSTER is specified 

Change mycluster to cluster example usage

Minor refactors
This commit is contained in:
bennerv 2020-11-06 12:52:12 -05:00
Родитель 18a52b94e4
Коммит 0721d978e9
2 изменённых файлов: 15 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
docs/deploy-development-rp.md
Просмотреть файл

@ -12,7 +12,7 @@
package is called `python-virtualenv` on both Fedora and Debian-based package is called `python-virtualenv` on both Fedora and Debian-based
systems. systems.
1. Fedora users: install the `gpgme-devel` and `libassuan-devel` packages. 1. Fedora users: install the `gpgme-devel`, `libassuan-devel`, and `openssl` packages.
Debian users: install the `libgpgme-dev` package. Debian users: install the `libgpgme-dev` package.
@ -150,13 +150,13 @@
OR use the create utility: OR use the create utility:
```bash ```bash
CLUSTER=mycluster go run ./hack/cluster create CLUSTER=cluster go run ./hack/cluster create
``` ```
Later the cluster can be deleted as follows: Later the cluster can be deleted as follows:
```bash ```bash
CLUSTER=mycluster go run ./hack/cluster delete CLUSTER=cluster go run ./hack/cluster delete
``` ```
[1]: https://docs.microsoft.com/en-us/azure/openshift/tutorial-create-cluster [1]: https://docs.microsoft.com/en-us/azure/openshift/tutorial-create-cluster
@ -189,16 +189,16 @@
## Debugging ## Debugging
* SSH to the bootstrap node: * SSH to the bootstrap node:
> __NOTE:__ If you have a password-based `sudo` command, you must first authenticate before running `sudo` in the background
```bash ```bash
sudo openvpn secrets/vpn-$LOCATION.ovpn & sudo openvpn secrets/vpn-$LOCATION.ovpn &
hack/ssh-agent.sh bootstrap CLUSTER=cluster hack/ssh-agent.sh bootstrap
``` ```
* Get an admin kubeconfig: * Get an admin kubeconfig:
```bash ```bash
make admin.kubeconfig CLUSTER=cluster make admin.kubeconfig
export KUBECONFIG=admin.kubeconfig export KUBECONFIG=admin.kubeconfig
``` ```
@ -207,7 +207,7 @@
* First, get the admin kubeconfig and `export KUBECONFIG` as detailed above. * First, get the admin kubeconfig and `export KUBECONFIG` as detailed above.
```bash ```bash
hack/ssh-agent.sh [master-{0,1,2}] CLUSTER=cluster hack/ssh-agent.sh [master-{0,1,2}]
``` ```

11
hack/ssh-agent.sh
Просмотреть файл

@ -5,9 +5,9 @@
# you want to pass in # you want to pass in
usage() { usage() {
echo "usage: $0 hostname_pattern" >&2 echo "usage: CLUSTER=cluster $0 hostname_pattern" >&2
echo " Examples: $0 master1" >&2 echo " Examples: CLUSTER=cluster $0 master1" >&2
echo " $0 bootstrap" >&2 echo " CLUSTER=cluster $0 bootstrap" >&2
exit 1 exit 1
} }
@ -24,6 +24,11 @@ trap cleanup EXIT
eval "$(ssh-agent | grep -v '^echo ')" eval "$(ssh-agent | grep -v '^echo ')"
if [[ -z "$CLUSTER" ]]; then
echo "CLUSTER must be specified"
usage
fi
if [[ -z "$RESOURCEID" ]]; then if [[ -z "$RESOURCEID" ]]; then
RESOURCEID="/subscriptions/${AZURE_SUBSCRIPTION_ID}/resourceGroups/${RESOURCEGROUP}/providers/Microsoft.RedHatOpenShift/openShiftClusters/${CLUSTER}" RESOURCEID="/subscriptions/${AZURE_SUBSCRIPTION_ID}/resourceGroups/${RESOURCEGROUP}/providers/Microsoft.RedHatOpenShift/openShiftClusters/${CLUSTER}"
fi fi