ci-operator/templates/openshift/installer: Bump AWS UPI to RHCOS 43.81.201911221453.0 #6192
Conversation
…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
openshift-ci-robot
added
size/XS
Dunno what that's about. /retest |
|
@wking: The following tests failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: abhinavdahiya, wking The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@wking: Updated the following 4 configmaps:
In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
…i*: Switch on BRANCH for RHCOS AMI As discussed in dc26075 (ci-operator/templates/openshift/installer: Bump AWS UPI to RHCOS 43.81.201911221453.0, 2019-12-02, openshift#6192), we want a way to switch on the z stream when selecting the RHCOS AMI. We amight also need this if other parts of the recommended user-provided-infrastructure flow diverge between z streams, although at the moment the AMI is the only divergence. In this commit, I'm sourcing my AMIs with: $ git cat-file -p origin/release-4.1:data/data/rhcos.json | jq -r '.amis["us-east-1"].hvm' ami-046fe691f52a953f9 $ git cat-file -p origin/release-4.2:data/data/rhcos.json | jq -r '.amis["us-east-1"].hvm' ami-01e7fdcb66157b224 $ git cat-file -p origin/release-4.3:data/data/rhcos.json | jq -r '.amis["us-east-1"].hvm' ami-014ce8846db8b463d $ git cat-file -p origin/master:data/data/rhcos.json | jq -r '.amis["us-east-1"].hvm' ami-014ce8846db8b463d as the installer stood at 2019-12-04T23:30Z. Comparing with the user-facing docs: $ git --no-pager grep -hA1 us-east-1 origin/enterprise-4.1:modules/installation-aws-user-infra-rhcos-ami.adoc |`us-east-1` |`ami-046fe691f52a953f9` $ git --no-pager grep -hA1 us-east-1 origin/enterprise-4.2:modules/installation-aws-user-infra-rhcos-ami.adoc |`us-east-1` |`ami-01e7fdcb66157b224` $ git --no-pager grep -hA1 us-east-1 origin/enterprise-4.3:modules/installation-aws-user-infra-rhcos-ami.adoc |`us-east-1` |`ami-01e7fdcb66157b224` $ git --no-pager grep -hA1 us-east-1 origin/enterprise-4.4:modules/installation-aws-user-infra-rhcos-ami.adoc fatal: Invalid object name 'origin/enterprise-4.4'. $ git --no-pager grep -hA1 us-east-1 origin/master:modules/installation-aws-user-infra-rhcos-ami.adoc |`us-east-1` |`ami-01e7fdcb66157b224` So we currently diverge for 4.3 and master, where I have [1,2] open to close the gaps. The BRANCH environment variable has been around since 22e30ea (The release promotion periodic can be conditional and no-op if no change, 2019-04-30, openshift#3649). I added it to all jobs based on the UPI template where it was missing (it was already on a number of those jobs). [1]: openshift/openshift-docs#18396 [2]: openshift/openshift-docs#18395
Catching up with openshift/installer@a8e9991876 (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.jsonlike c85599a (#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 (4.1, 4.2, and 4.3), which is what users will be doing.