Skip to content

Set KUBE_SSH_BASTION and KUBE_SSH_KEY_PATH in installer tests #2469

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 1 commit into from
Dec 24, 2018
Merged

Set KUBE_SSH_BASTION and KUBE_SSH_KEY_PATH in installer tests #2469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ objects:
- name: artifacts
mountPath: /tmp/artifacts
env:
- name: ARTIFACT_DIR
value: /tmp/artifacts
- name: HOME
value: /tmp/home
- name: KUBECONFIG
Expand Down Expand Up @@ -191,6 +193,9 @@ objects:
# oh god the blood
sleep 180

export KUBE_SSH_BASTION="$( oc get node -l node-role.kubernetes.io/master -o 'jsonpath={.items[0].status.addresses[?(@.type=="ExternalIP")].address}' ):22"
export KUBE_SSH_KEY_PATH=/tmp/cluster/ssh-privatekey

# set up cloud-provider-specific env vars
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json"
Expand Down
14 changes: 9 additions & 5 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ objects:
- name: artifacts
mountPath: /tmp/artifacts
env:
- name: INSTANCE_PREFIX
value: ${NAMESPACE}-${JOB_NAME_HASH}
- name: ARTIFACT_DIR
value: /tmp/artifacts
- name: HOME
value: /tmp/home
- name: KUBECONFIG
Expand All @@ -104,7 +104,9 @@ objects:

trap 'touch /tmp/shared/exit' EXIT
trap 'kill $(jobs -p); exit 0' TERM


cp "$(which oc)" /tmp/shared/

mkdir -p "${HOME}"

# wait for the router namespace
Expand All @@ -127,7 +129,6 @@ objects:
# don't let clients impact the global kubeconfig
cp "${KUBECONFIG}" /tmp/admin.kubeconfig
export KUBECONFIG=/tmp/admin.kubeconfig
export ARTIFACT_DIR=/tmp/artifacts
fi
if ! oc get nodes 2>/dev/null; then
echo "Waiting for API at $(oc whoami --show-server) to respond ..."
Expand Down Expand Up @@ -187,6 +188,9 @@ objects:
# oh god the blood
sleep 180

export KUBE_SSH_BASTION="$( oc get node -l node-role.kubernetes.io/master -o 'jsonpath={.items[0].status.addresses[?(@.type=="ExternalIP")].address}' ):22"
export KUBE_SSH_KEY_PATH=/tmp/cluster/ssh-privatekey

# set up cloud-provider-specific env vars
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json"
Expand All @@ -205,7 +209,7 @@ objects:
mkdir -p ~/.ssh
cp /tmp/cluster/ssh-privatekey ~/.ssh/kube_openstack_rsa || true
fi

${TEST_COMMAND}

# Runs an install
Expand Down