diff --git a/scripts/library/ocp.sh b/scripts/library/ocp.sh index ee812e21..78a80cea 100644 --- a/scripts/library/ocp.sh +++ b/scripts/library/ocp.sh @@ -582,3 +582,13 @@ ocp_clean_install_pods(){ -A \ -l app=installer } + +ocp_get_kubeconfigs(){ + # https://rcarrata.com/openshift/regenerate-kubeconfig/ + # https://gist.githubusercontent.com/rcarrata/016da295c1421cccbfbd66ed9a7922bc/raw/855486c363734892988cdf1b5d0d26ece5e0960a/regenerate-kubeconfig.sh + # https://access.redhat.com/solutions/6054981 + # https://access.redhat.com/solutions/5286371 + # https://access.redhat.com/solutions/6112601 + + oc -n openshift-kube-apiserver extract secret/node-kubeconfigs +} diff --git a/scripts/reverse_tunnel/reverse-tunnel.service b/scripts/reverse_tunnel/reverse-tunnel.service index 6a3cfadc..236a399c 100644 --- a/scripts/reverse_tunnel/reverse-tunnel.service +++ b/scripts/reverse_tunnel/reverse-tunnel.service @@ -13,7 +13,7 @@ RestartSec=20 WorkingDirectory=/etc/reverse_tunnel/ EnvironmentFile=/etc/reverse_tunnel/env User=reverse-tunnel -ExecStart=/etc/reverse_tunnel/reverse_tunnel.sh +ExecStart=/usr/local/bin/reverse_tunnel.sh [Install] WantedBy=multi-user.target diff --git a/scripts/reverse_tunnel/reverse_tunnel.sh b/scripts/reverse_tunnel/reverse_tunnel.sh index fe7d6c14..37b6e9b0 100755 --- a/scripts/reverse_tunnel/reverse_tunnel.sh +++ b/scripts/reverse_tunnel/reverse_tunnel.sh @@ -59,18 +59,6 @@ usage_ocp(){ usage_host(){ echo " - Add reverse-tunnel user: - - sudo useradd reverse-tunnel -g -m -d ${APP_PATH} -k /dev/null - sudo chmod 770 ${APP_PATH} - sudo usermod \$USER -a -G reverse-tunnel - - Install script and env into ${APP_PATH}: - - cp reverse_tunnel.sh ${APP_PATH}/ - cp reverse_tunnel.env.sample ${APP_PATH}/env - cp reverse-tunnel.service /etc/systemd/system/ - Enable service: systemctl enable reverse-tunnel --now @@ -81,6 +69,31 @@ usage_host(){ exit 0 } +kludge_install_user(){ + id reverse-tunnel && return + + # add reverse-tunnel user + sudo usermod "${USER}" -a -G reverse-tunnel + + sudo su root /bin/bash -c " + useradd reverse-tunnel -U -m -d ${APP_PATH} -k /dev/null + " +} + +kludge_install_app(){ + SCRIPT_DIR=$(get_script_path) + [ "${SCRIPT_DIR}" == "/usr/local/bin" ] && return + + # install script and env into ${APP_PATH} + sudo su root /bin/bash -c " + chmod 770 ${APP_PATH}/ + cp ${SCRIPT_DIR}/reverse_tunnel.sh /usr/local/bin/ + [ -e ${SCRIPT_DIR}/env.sample ] || cp ${SCRIPT_DIR}/env.sample ${APP_PATH}/env + cp ${SCRIPT_DIR}/reverse-tunnel.service /etc/systemd/system/ + chown reverse-tunnel:reverse-tunnel ${APP_PATH}/* + " +} + kludge_uninstall(){ sudo su root /bin/bash -c " rm /etc/systemd/system/reverse-tunnel.service @@ -101,7 +114,8 @@ check_install(){ [ -z "${SSH_KEY}" ] && var_unset "SSH_KEY" [ -e "${SSH_KEY}" ] || gen_key - [ "$(get_script_path)" == "${APP_PATH}" ] && return + kludge_install_user + kludge_install_app && return usage }