modules/installation-aws-user-infra-rhcos-ami: Bump to RHCOS 44.81.202001030903.0 #18395
Conversation
openshift-ci-robot
added
the
size/M
|
4.3 "backport" is #18396, although since 4.4 and 4.3 have diverged in the installer it's not a clean cherrypick. 4.2 and 4.1 docs match the current installer tips for 4.1 and 4.2 releases. |
|
@jianlinliu, do you agree? |
…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
|
@jianlinliu, will you PTAL? |
|
This is for 4.3, right? |
|
New 4.3 bump: #18917 |
|
This 4.4/master PR needs to be rerolled to catch up with openshift/installer@068e3df3f (openshift/installer#2826). I'll do that tonight. |
If we plan to bump boot RHCOS image version, then I think https://github.com/openshift/installer/blob/release-4.3/data/data/rhcos.json also need a PR. |
Once ready, will check again. |
No, it's 43.81.201912131630.0, I just flubbed the commit message. Fixed now. |
…2001030903.0 Catching up with openshift/installer@068e3df3f7 (Bump RHCOS to 44.81.202001030903.0, 2020-01-03, openshift/installer#2826). Generated with: $ date --iso=m --utc 2020-01-09T03:43+0000 $ git fetch origin $ git --no-pager log -1 --oneline origin/master -- data/data/rhcos.json 068e3df3f Bump RHCOS to 44.81.202001030903.0 $ git cat-file -p 068e3df3f:data/data/rhcos.json | jq -r '.amis | to_entries | sort_by(.key)[] | "\n|`" + .key + "`\n|`" + .value.hvm + "`"' and pasting the output into the module doc.
wking
changed the title
|
I've pushed 263f466f0 -> 0cc4ba1, bumping this PR to 44.81.202001030903.0 to catch up with openshift/installer@068e3df3f. Bahrain (me-south-1) is still getting worked on, but the installer side of that has landed via openshift/installer#2826, and we can drop it here if it turns out that other components are not ready for Bahrain in 4.4. |
Acked. |
|
LGTM for this 4.4 PR. |
Catching up with openshift/installer@a8e9991876 (openshift/installer#2714) and its encryption fixes. Generated with:
$ git cat-file -p a8e9991876:data/data/rhcos.json | jq -r '.amis | to_entries | sort_by(.key)[] | "\n|`" + .key + "`\n|`" + .value.hvm + "`"'and pasting the output into the module doc.