Skip to content

Bug 1782063: aws/upi: Figure out AMI from rhcos.json #6835

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
Jan 24, 2020
Merged

Bug 1782063: aws/upi: Figure out AMI from rhcos.json #6835

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
3 changes: 1 addition & 2 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1195,8 +1195,7 @@ objects:

# begin bootstrapping
if [[ "${CLUSTER_TYPE}" == "aws" ]]; then
# Derived from https://github.com/openshift/installer/blob/93c78d09ed9e2badb4bf5dab708152fe6b3b6602/data/data/rhcos.json#L40
RHCOS_AMI=ami-0aea6a5be0fc2b3fc # FIXME: assumes AWS_REGION is us-east-1
RHCOS_AMI="$(jq -r .amis[\"${AWS_REGION}\"].hvm /var/lib/openshift-install/rhcos.json)"
Copy link
Member

@wking wking Jan 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd have expected:

RHCOS_AMI="$(jq -r ".amis[\"${AWS_REGION}\"].hvm" /var/lib/openshift-install/rhcos.json)"

(with additional quoting around the jq expression) but this seems to work as you have it as well.


# FIXME: get epel-release or otherwise add awscli to our UPI image
export PATH="${HOME}/.local/bin:${PATH}"
Expand Down
6 changes: 2 additions & 4 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ objects:
- |
#!/bin/bash
set -euo pipefail

trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; fi; exit "${rc}"' EXIT
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM

Expand Down Expand Up @@ -505,9 +505,7 @@ objects:

# begin bootstrapping
if [[ "${CLUSTER_TYPE}" == "aws" ]]; then
# Derived from https://github.com/openshift/installer/blob/93c78d09ed9e2badb4bf5dab708152fe6b3b6602/data/data/rhcos.json#L40
RHCOS_AMI=ami-0aea6a5be0fc2b3fc # FIXME: assumes AWS_REGION is us-east-1

RHCOS_AMI="$(jq -r .amis[\"${AWS_REGION}\"].hvm /var/lib/openshift-install/rhcos.json)"
# FIXME: get epel-release or otherwise add awscli to our UPI image
export PATH="${HOME}/.local/bin:${PATH}"
easy_install --user pip # our Python 2.7.5 is even too old for ensurepip
Expand Down