build: Add image.yaml option to inject OpenShift CVO annotations #3153
Conversation
This file contains hidden or 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
cgwalters
force-pushed
the
add-machine-os
branch
from
65c0b1a to
4006f64
Compare
Member
Author
|
OK now fixed up to use the contents of |
jlebon
reviewed
Nov 1, 2022
cgwalters
force-pushed
the
add-machine-os
branch
2 times, most recently
from
767eaf1 to
2708e97
Compare
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.
cgwalters
force-pushed
the
add-machine-os
branch
from
2708e97 to
0fc61fe
Compare
Member
Author
|
Ugh shell script 😦 |
jlebon
approved these changes
Nov 1, 2022
Member
Author
|
Test failure in kola is definitely not related, though we do need to chase that down |
|
@cgwalters: Overrode contexts on behalf of cgwalters: ci/prow/rhcos DetailsIn response to this:
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. |
cgwalters
added a commit
to cgwalters/os
that referenced
this pull request
Nov 1, 2022
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
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.