Skip to content

templates/openshift/installer: update setup for installer to gather logs on bootstrap failure #4009

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
Jun 12, 2019
Merged

templates/openshift/installer: update setup for installer to gather logs on bootstrap failure #4009

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
6 changes: 6 additions & 0 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-console.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ objects:
value: ${NAMESPACE}-${JOB_NAME_HASH}
- name: BASE_DOMAIN
value: ${BASE_DOMAIN}
- name: SSH_PRIV_KEY_PATH
value: /etc/openshift-installer/ssh-privatekey
- name: SSH_PUB_KEY_PATH
value: /etc/openshift-installer/ssh-publickey
- name: PULL_SECRET_PATH
Expand Down Expand Up @@ -229,6 +231,10 @@ objects:
export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}")
export PULL_SECRET=$(cat "${PULL_SECRET_PATH}")

## move private key to ~/.ssh/ so that installer can use it to gather logs on bootstrap failure
mkdir -p ~/.ssh
cp "${SSH_PRIV_KEY_PATH}" ~/.ssh/

if [[ "${CLUSTER_TYPE}" == "aws" ]]; then
cat > /tmp/artifacts/installer/install-config.yaml << EOF
apiVersion: v1beta4
Expand Down
6 changes: 6 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 @@ -542,6 +542,8 @@ objects:
value: ${NAMESPACE}-${JOB_NAME_HASH}
- name: BASE_DOMAIN
value: ${BASE_DOMAIN}
- name: SSH_PRIV_KEY_PATH
value: /etc/openshift-installer/ssh-privatekey
- name: SSH_PUB_KEY_PATH
value: /etc/openshift-installer/ssh-publickey
- name: PULL_SECRET_PATH
Expand Down Expand Up @@ -576,6 +578,10 @@ objects:
export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}")
export PULL_SECRET=$(cat "${PULL_SECRET_PATH}")

## move private key to ~/.ssh/ so that installer can use it to gather logs on bootstrap failure
mkdir -p ~/.ssh
cp "${SSH_PRIV_KEY_PATH}" ~/.ssh/

if [[ "${CLUSTER_TYPE}" == "aws" ]]; then
cat > /tmp/artifacts/installer/install-config.yaml << EOF
apiVersion: v1
Expand Down
6 changes: 6 additions & 0 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 @@ -198,6 +198,8 @@ objects:
value: ${NAMESPACE}-${JOB_NAME_HASH}
- name: BASE_DOMAIN
value: ${BASE_DOMAIN}
- name: SSH_PRIV_KEY_PATH
value: /etc/openshift-installer/ssh-privatekey
- name: SSH_PUB_KEY_PATH
value: /etc/openshift-installer/ssh-publickey
- name: PULL_SECRET_PATH
Expand Down Expand Up @@ -235,6 +237,10 @@ objects:
export SSH_PUB_KEY=$(cat "${SSH_PUB_KEY_PATH}")
export PULL_SECRET=$(cat "${PULL_SECRET_PATH}")

## move private key to ~/.ssh/ so that installer can use it to gather logs on bootstrap failure
mkdir -p ~/.ssh
cp "${SSH_PRIV_KEY_PATH}" ~/.ssh/

if [[ "${CLUSTER_TYPE}" == "aws" ]]; then
cat > /tmp/artifacts/installer/install-config.yaml << EOF
apiVersion: v1
Expand Down