image*.yaml: Enable injection of OCP machine-os metadata by default
#1048
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It's the default now.
This is implemented by coreos/coreos-assembler#3153 We had these in the legacy oscontainer for RHCOS, and OKD today hacks them in via a Dockerfile: https://github.com/openshift/okd-machine-os/blob/0e9fbabbd3363bfc46d9d657bc173666e83e5d18/Dockerfile#L34 We need to carry support for this forward into the new format image, as it's what is used to display the OS version as part of the release image. Also xref https://issues.redhat.com/browse/TRT-647
openshift-ci
bot
added
the
do-not-merge/work-in-progress
|
Skipping CI for Draft Pull Request. |
openshift-ci
bot
added
the
approved
|
Pairs with https://url.corp.redhat.com/a107a47 |
|
/lgtm |
|
/test all |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cgwalters, jlebon The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
|
@cgwalters: all tests passed! Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
jlebon
added a commit
to jlebon/os
that referenced
this pull request
Sep 27, 2023
This was previously enabled (openshift#1048) and then disabled again (openshift#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 openshift#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
jlebon
added a commit
to jlebon/os
that referenced
this pull request
Sep 27, 2023
This was previously enabled (openshift#1048) and then disabled again (openshift#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 openshift#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
jlebon
added a commit
to jlebon/os
that referenced
this pull request
Mar 7, 2024
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!
jlebon
added a commit
to jlebon/os
that referenced
this pull request
Mar 7, 2024
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!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
NOTE: This will actually break things unless we also in the same transaction implement the
machine-os-content➡️rhel-coreos-8alias when building the release image.Which actually implies that this configuration should be part of this repository, and not part of the pipeline config (legacy: jobspec, new: pipeline config.yaml).
Hmm. Perhaps I can for now change the legacy pipeline to grep
image.yamlitself...edit done in https://url.corp.redhat.com/a107a47
image: Drop unused
oci-formatIt's the default now.
image*.yaml: Enable injection of OCP
machine-osmetadata by defaultThis is implemented by coreos/coreos-assembler#3153
We had these in the legacy oscontainer for RHCOS, and OKD today hacks them in via a Dockerfile:
https://github.com/openshift/okd-machine-os/blob/0e9fbabbd3363bfc46d9d657bc173666e83e5d18/Dockerfile#L34
We need to carry support for this forward into the new format image, as it's what is used to display the OS version as part of the release image.
Also xref https://issues.redhat.com/browse/TRT-647