Skip to content

Commit

Permalink
ci-operator/templates/openshift/installer: Bump AWS UPI to RHCOS 43.8…
Browse files Browse the repository at this point in the history
…1.201911221453.0

Catching up with openshift/installer@a8e9991876 (rhcos: Bump to
43.81.201911221453.0, 2019-11-22, openshift/installer#2714) and its
encryption fixes.

Unfortunately we still don't have a way to expose the installer's
recommended default, and I'm still opposed to reaching into the
installer sources and looking in its internal rhcos.json like
c85599a (templates/installer/e2e-metal: use the rhcos.json from
upi-installer image to pick bootimage, 2019-04-26, openshift#3612) is doing for
metal, because that's not what our users will be doing.  Using the
installer's tip AMI defaults is also not what users will be doing, but
I'm not clear on how we can select the right branch in the templates
to pull from the openshift-docs defaults [1,2,3] (which is what users
will be doing).

[1]: https://docs.openshift.com/container-platform/4.1/installing/installing_aws_user_infra/installing-aws-user-infra.html#installation-aws-user-infra-rhcos-ami_installing-aws-user-infra
[2]: https://docs.openshift.com/container-platform/4.2/installing/installing_aws_user_infra/installing-aws-user-infra.html#installation-aws-user-infra-rhcos-ami_installing-aws-user-infra
[3]: https://github.com/openshift/openshift-docs/blob/b24fe4684f8f6ba11cae92c5a779abbe4af57717/modules/installation-aws-user-infra-rhcos-ami.adoc#op-system-amis-for-the-aws-infrastructure
  • Loading branch information
wking committed Dec 3, 2019
1 parent 9ea7734 commit dc26075
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1265,8 +1265,7 @@ objects:
# begin bootstrapping
if [[ "${CLUSTER_TYPE}" == "aws" ]]; then
# RHCOS_AMI=ami-0df3f99538fbef10f # 4.1 ami FIXME: assumes AWS_REGION is us-east-1
RHCOS_AMI=ami-0ae2df22579e00be5 # 4.2 ami FIXME: assumes AWS_REGION is us-east-1
RHCOS_AMI=ami-014ce8846db8b463d # FIXME: assumes AWS_REGION is us-east-1
# FIXME: get epel-release or otherwise add awscli to our UPI image
export PATH="${HOME}/.local/bin:${PATH}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ objects:
# begin bootstrapping
if [[ "${CLUSTER_TYPE}" == "aws" ]]; then
RHCOS_AMI=ami-0df3f99538fbef10f # FIXME: assumes AWS_REGION is us-east-1
RHCOS_AMI=ami-014ce8846db8b463d # FIXME: assumes AWS_REGION is us-east-1
# FIXME: get epel-release or otherwise add awscli to our UPI image
export PATH="${HOME}/.local/bin:${PATH}"
Expand Down

0 comments on commit dc26075

Please sign in to comment.