Re-enable ostree-container-inject-openshift-cvo-labels knob

This was previously enabled (#1048) and then disabled again (#1084) because `oc` doesn't know how to handle multiple images with those labels in the release payload. We'll need to solve this eventually if we want to be able to ship multiple OS images in the payload (that's tracked in #1047), but we don't need to block on this if we can remove the legacy `machine-os-content` at the same time. See also: openshift/driver-toolkit#101 See also: openshift/machine-config-operator#3364
openshift · Sep 27, 2023 · 32e890c · 32e890c
1 parent b86ac33
commit 32e890c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/image-c9s.yaml b/image-c9s.yaml
@@ -24,3 +24,6 @@ vmware-hw-version: 15
 aws-imdsv2-only: false
 aws-volume-type: "gp2"
 aws-x86-boot-mode: "legacy-bios"
+
+# add the requisite OCP metadata to our container image
+ostree-container-inject-openshift-cvo-labels: true
diff --git a/image-rhel-9.2.yaml b/image-rhel-9.2.yaml
@@ -21,3 +21,6 @@ vmware-hw-version: 15
 aws-imdsv2-only: false
 aws-volume-type: "gp2"
 aws-x86-boot-mode: "legacy-bios"
+
+# add the requisite OCP metadata to our container image
+ostree-container-inject-openshift-cvo-labels: true