Skip to content

Commit

Permalink
Use stream metadata for RHCOS, bump x86_64 to 48.83.202102230316-0
Browse files Browse the repository at this point in the history
This implements part of the plan from:
openshift/os#477

When we originally added the pinned RHCOS metadata `rhcos.json`
to the installer, we also changed the coreos-assembler `meta.json`
format into an arbitrary new format in the name of some cleanups.
In retrospect, this was a big mistake because we now have two
formats.

Then Fedora CoreOS appeared and added streams JSON as a public API.

We decided to unify on streams metadata; there's now a published
Go library for it: https://github.com/coreos/stream-metadata-go

Among other benefits, it is a single file that supports multiple
architectures.

UPI installs should now use stream metadata, particularly
to find public cloud images.

This is an important preparatory step for exposing this via
`oc` as well as having something in the cluster update to
it.
  • Loading branch information
cgwalters committed Mar 1, 2021
1 parent 6049665 commit 1d81555
Show file tree
Hide file tree
Showing 23 changed files with 586 additions and 816 deletions.
4 changes: 2 additions & 2 deletions data/data/install.openshift.io_installconfigs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1760,8 +1760,8 @@ spec:
will be cloned into.
type: string
clusterOSImage:
description: ClusterOSImage overrides the url provided in rhcos.json
to download the RHCOS OVA
description: ClusterOSImage overrides the url embedded in the installer
to download the RHEL CoreOS OVA
type: string
datacenter:
description: Datacenter is the name of the datacenter to use in
Expand Down
394 changes: 394 additions & 0 deletions data/data/rhcos-4.8.json

Large diffs are not rendered by default.

163 changes: 0 additions & 163 deletions data/data/rhcos-amd64.json

This file was deleted.

61 changes: 0 additions & 61 deletions data/data/rhcos-ppc64le.json

This file was deleted.

68 changes: 0 additions & 68 deletions data/data/rhcos-s390x.json

This file was deleted.

Loading

0 comments on commit 1d81555

Please sign in to comment.