From 11ad8c7365ba9628221321ec0b9b3170ca7a31f9 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 7 Dec 2022 14:35:11 -0500 Subject: [PATCH] Revert "image*.yaml: Enable injection of OCP `machine-os` metadata by default" This reverts commit f4646dc2d5a83f9101f3b40e3235cebd1ee5c58a. We're seeing failures here because as of right now the `machine-os-content` and `rhel-coreos-8` are not aliases; and even if they were it appears that `oc` would need work to handle this. --- image-rhel-8.6.yaml | 3 --- image-rhel-9.0.yaml | 3 --- 2 files changed, 6 deletions(-) diff --git a/image-rhel-8.6.yaml b/image-rhel-8.6.yaml index 0966b587..d01b5fc8 100644 --- a/image-rhel-8.6.yaml +++ b/image-rhel-8.6.yaml @@ -8,9 +8,6 @@ squashfs-compression: gzip # 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 diff --git a/image-rhel-9.0.yaml b/image-rhel-9.0.yaml index 7d7b61d1..17c8d9cc 100644 --- a/image-rhel-9.0.yaml +++ b/image-rhel-9.0.yaml @@ -5,9 +5,6 @@ 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