From dc2607523066da7433e689bd422dc4599d6c6e2c Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Mon, 2 Dec 2019 16:40:58 -0800 Subject: [PATCH] ci-operator/templates/openshift/installer: Bump AWS UPI to RHCOS 43.81.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 c85599a25b (templates/installer/e2e-metal: use the rhcos.json from upi-installer image to pick bootimage, 2019-04-26, #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 --- .../openshift/installer/cluster-launch-installer-upi-e2e.yaml | 3 +-- .../openshift/installer/cluster-launch-installer-upi-src.yaml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml index 0375a5dcc07b7..2c7886a8b8528 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml @@ -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}" diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml index b046ef9c6f614..a50677c743842 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml @@ -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}"