-
Notifications
You must be signed in to change notification settings - Fork 15
ROX-30918, ROX-31049: Update labels, fix docker mediaType #2300
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
Skipping CI for Draft Pull Request. |
7bbe967 to
11c0586
Compare
as proposed in #2148
11c0586 to
0107ed6
Compare
I wired it through pipeline files and not dockerfiles because when changing app, component and serviceaccount suffixes, it can also be noticed and modified in the same place rather than chasing konflux.Dockerfiles.
via `BUILD_TIMESTAMP` param. The label is currently highlighted as a warning by Conforma.
0107ed6 to
85c1a10
Compare
|
/retest |
Checking mediaTypeFirst, on image index. For the new image For some old image From there, one can check on per-arch images like this: So we need to make sure there's |
|
Here's my "data dump" script: #!/usr/bin/env bash
set -euo pipefail
tag="2.37.x-123-g85c1a10c2f-fast"
parent="quay.io/rhacs-eng"
repos=(release-scanner release-scanner-db release-scanner-slim release-scanner-db-slim)
arch_suffixes=(amd64 s390x ppc64le arm64)
echo " >>> Checking mediaType on indexes"
for repo in "${repos[@]}"; do
index="${parent}/${repo}:${tag}"
echo " >>> on ${index}"
skopeo inspect --raw "docker://${index}" | jq | grep mediaType
done
echo " >>> Checking mediaType on images"
for repo in "${repos[@]}"; do
index="${parent}/${repo}:${tag}"
for arch in "${arch_suffixes[@]}"; do
image="${index}-${arch}"
echo " >>> on ${image}"
skopeo inspect --raw "docker://${image}" | jq | grep mediaType
done
done
echo " >>> Checking labels on images"
for repo in "${repos[@]}"; do
index="${parent}/${repo}:${tag}"
for arch in "${arch_suffixes[@]}"; do
image="${index}-${arch}"
echo " >>> on ${image}"
skopeo inspect --no-tags "docker://${image}" | grep -E '"(cpe|name|org.opencontainers.image.created)"'
done
doneRan it both stand-alone and looked in the output and as |
| value: [ 'nvd-definitions.zip', 'k8s-definitions.zip', 'repo2cpe.zip', 'genesis_manifests.json' ] | ||
| - name: extra-labels | ||
| value: | ||
| # X.Y in the cpe label must be adjusted for every version stream. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[post-merge] This needs to be mentioned in the https://spaces.redhat.com/spaces/StackRox/pages/690979844/Upstream+Konflux+Release#Upstream+KonfluxRelease-update-version-in-reposPutversioninKonfluxpipelinesandDockerfiles
|
@msugakov: The following test failed, say
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-sigs/prow repository. I understand the commands that are listed here. |
Description
In this PR:
cpeandnamelabels similar to as suggested in PRs from Ralph, e.g. chore(KONFLUX-6210): fix name label and set cpe label #2148.org.opencontainers.image.createdlabel. This one is flagged as a warning by Conforma and so worth proactively addressing. It goes viaBUILD_TIMESTAMPparam. See the related thread.BUILDAH_FORMATparam.The PR can be reviewed by commits.
This PR is to backported to release branches (part of the same task).
Validation
cpeis there.nameis new.org.opencontainers.image.createdis there and looks valid.Did this by looking at the output of the script provided below.