Merge pull request #1084 from cgwalters/revert-machine-os-metadata

Revert "image*.yaml: Enable injection of OCP `machine-os` metadata by…
openshift · Dec 8, 2022 · b25d766 · b25d766
2 parents 89f0eeb + 11ad8c7
commit b25d766
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git 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
@@ -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