Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

image*.yaml: Enable injection of OCP machine-os metadata by default #1048

Merged
merged 2 commits into from
Nov 21, 2022
Merged

image*.yaml: Enable injection of OCP machine-os metadata by default #1048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbafe62
image: Drop unused `oci-format`
cgwalters Nov 1, 2022
f4646dc
image*.yaml: Enable injection of OCP `machine-os` metadata by default
cgwalters Nov 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions image-rhel-8.6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ squashfs-compression: gzip
# defaulting to `ip=dhcp,dhcp6 rd.neednet=1` when it doesn't see this key.
ignition-network-kcmdline: []

# See https://github.com/coreos/coreos-assembler/pull/3014 - this
# will hopefully be the default soon, but trying to enable it here first.
ostree-format: "oci-chunked-v1"
# Keep OCP metadata on our container image, but xref https://github.com/openshift/os/issues/1047
ostree-container-inject-openshift-cvo-labels: true

# vmware-secure-boot changes the EFI secure boot option.
# set false here due to https://bugzilla.redhat.com/show_bug.cgi?id=2106055
Expand Down
3 changes: 3 additions & 0 deletions image-rhel-9.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ size: 16
# defaulting to `ip=dhcp,dhcp6 rd.neednet=1` when it doesn't see this key.
ignition-network-kcmdline: []

# Keep OCP metadata on our container image, but xref https://github.com/openshift/os/issues/1047
ostree-container-inject-openshift-cvo-labels: true

# vmware-secure-boot changes the EFI secure boot option.
# set false here due to https://bugzilla.redhat.com/show_bug.cgi?id=2106055
vmware-secure-boot: false
Expand Down