Skip to content

Commit

Permalink
Re-enable ostree-container-inject-openshift-cvo-labels knob
Browse files Browse the repository at this point in the history
This was previously enabled (openshift#1048, openshift#1374) and then disabled again (openshift#1084, openshift#1393).

The last time we tried it, the issue was that there were some references
remaining in openshift/kubernetes and openshift/release. Those have been
cleaned up now:

openshift/release#49156
openshift/kubernetes#1805

So... third time's the charm!
  • Loading branch information
jlebon committed Mar 7, 2024
1 parent 873c696 commit e102df8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
3 changes: 2 additions & 1 deletion image-c9s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ deploy-via-container: true
# defaulting to `ip=dhcp,dhcp6 rd.neednet=1` when it doesn't see this key.
ignition-network-kcmdline: []

# In OKD, keep OpenShift metadata on our container image, but xref https://github.com/openshift/os/issues/1047
# add the requisite OCP metadata to 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.
Expand Down
4 changes: 4 additions & 0 deletions image-rhel-9.4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ deploy-via-container: true
# defaulting to `ip=dhcp,dhcp6 rd.neednet=1` when it doesn't see this key.
ignition-network-kcmdline: []

# add the requisite OCP metadata to 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

0 comments on commit e102df8

Please sign in to comment.