Bug 2011460: UPSTREAM: <carry>: openshift-hack/images/os/Dockerfile: Add io.openshift.build.versions, etc. #1005
Conversation
…ift.build.versions, etc.
For example, consider the current 4.10 RHCOS:
$ oc image info -o json registry.ci.openshift.org/ocp/4.10:machine-os-content | jq -r '.config.config.Labels | to_entries[] | .key + ": " + .value' | grep '^io\.k8s\|^io\.openshift'
io.k8s.description: The Universal Base Image is designed and engineered to be the base layer for all of your containerized applications, middleware and utilities. This base image is freely redistributable, but Red Hat only supports Red Hat technologies through subscriptions for Red Hat products. This image is maintained by Red Hat and updated regularly.
io.k8s.display-name: Red Hat Universal Base Image 8
io.openshift.build.version-display-names: machine-os=Red Hat Enterprise Linux CoreOS
io.openshift.build.versions: machine-os=49.84.202109102026-0
io.openshift.expose-services:
io.openshift.tags: base rhel8
A bunch of those seem to be inherited from the UBI base image, so we
can leave them alone. But the io.openshift.build.* entries are
RHCOS-specific, and are consumed by 'oc adm release new ...' [1,2] and
friends to answer questions like "which RHCOS is in this release?":
$ oc adm release info -o json quay.io/openshift-release-dev/ocp-release:4.8.12-x86_64 | jq .displayVersions
{
"kubernetes": {
"Version": "1.21.1",
"DisplayName": ""
},
"machine-os": {
"Version": "48.84.202109100857-0",
"DisplayName": "Red Hat Enterprise Linux CoreOS"
}
}
Setting this label will avoid failures when consumers like
driver-toolkit's version consumer [3]:
name: 0.0.1-snapshot-machine-os
bump into ci-tools-built machine-os-content images that lack the
io.openshift.build.versions declaration of machine-os version [4]:
error: unable to create a release: unknown version reference "machine-os"
I've gone with generic testing values, so hopefully this is not
something that local maintainers need to remember to bump for each
OpenShift z stream.
[1]: https://github.com/openshift/oc/blob/f94afb52dc8a3185b3b9eacaf92ec34d80f8708d/pkg/cli/admin/release/image_mapper.go#L328-L334
[2]: https://github.com/openshift/oc/blob/f94afb52dc8a3185b3b9eacaf92ec34d80f8708d/pkg/cli/admin/release/annotations.go#L19-L28
[3]: openshift/driver-toolkit@464acca#diff-4caed9b2b966a8fa7a016ae28976634a2d3d1b635c4e820d5c038b2305d6af53R18
[4]: https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_kubernetes/959/pull-ci-openshift-kubernetes-master-images/1438398678602616832#1:build-log.txt%3A97
openshift-ci-robot
added
the
backports/unvalidated-commits
|
@openshift-cherrypick-robot: the contents of this pull request could not be automatically validated. The following commits could not be validated and must be approved by a top-level approver:
|
|
@openshift-cherrypick-robot: Bugzilla bug 2008619 has been cloned as Bugzilla bug 2011460. Retitling PR to link against new bug. In 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. |
openshift-ci
bot
changed the title
openshift-ci
bot
added
bugzilla/severity-high
|
@openshift-cherrypick-robot: This pull request references Bugzilla bug 2011460, which is invalid:
Comment In 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. |
|
/retitle Bug 2011460: UPSTREAM: : openshift-hack/images/os/Dockerfile: Add io.openshift.build.versions, etc. No need to keep building up release-4.y markers in the title, because GitHub tracks that as structured PR-base metadata. |
openshift-ci
bot
changed the title
|
/bugzilla refresh |
openshift-ci
bot
added
bugzilla/valid-bug
|
@kpouget: This pull request references Bugzilla bug 2011460, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker. 6 validation(s) were run on this bug
Requesting review from QA contact: In 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. |
|
@dagrayvid: The
The following commands are available to trigger optional jobs:
Use
In 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. |
|
/retest-required |
1 similar comment
|
/retest-required |
|
/retest |
|
ping @sttts, we need this PR for merging the DriverToolkit imagestream in 4.8 |
|
/approve |
sttts
removed
the
backports/unvalidated-commits
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: openshift-cherrypick-robot, sttts, wabouhamad 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
added
the
approved
|
@sttts I'm not sure who to ask for |
sdodson
added
backport-risk-assessed
|
@openshift-cherrypick-robot: Some pull requests linked via external trackers have merged: The following pull requests linked via external trackers have not merged:
These pull request must merge or be unlinked from the Bugzilla bug in order for it to move to the next state. Once unlinked, request a bug refresh with Bugzilla bug 2011460 has not been moved to the MODIFIED state. In 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. |
This is an automated cherry-pick of #983
/assign dagrayvid