Skip to content

ROX-30918, ROX-31049: Update labels, fix docker mediaType #2568

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Oct 15, 2025
Merged

ROX-30918, ROX-31049: Update labels, fix docker mediaType #2568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b4fa79
Merge LABEL-s in the single block
msugakov Oct 13, 2025
20deb72
Set `name` label
msugakov Oct 13, 2025
48b4c3c
Populate `org.opencontainers.image.created` label
msugakov Oct 15, 2025
ae583ed
Populate `BUILDAH_FORMAT` where missing
msugakov Oct 15, 2025
e179ea7
Populate `cpe` label
msugakov Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .tekton/collector-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ spec:
value: 'true'
- name: build-source-image
value: 'true'
- name: extra-labels
value:
# X.Y in the cpe label must be adjusted for every version stream.
- "cpe=cpe:/a:redhat:advanced_cluster_security:X.Y::el8"

workspaces:
- name: git-auth
Expand Down
25 changes: 25 additions & 0 deletions .tekton/collector-component-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ spec:
default: docker
type: string
description: The format for the resulting image's mediaType. Valid values are oci or docker.
- name: extra-labels
type: array
description: Additional labels to put on the built containers.
results:
- description: ""
name: IMAGE_URL
Expand Down Expand Up @@ -263,6 +266,10 @@ spec:
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
- name: BUILDAH_FORMAT
value: $(params.buildah-format)
- name: LABELS
value: ["$(params.extra-labels[*])"]
- name: BUILD_TIMESTAMP
value: "$(tasks.clone-repository.results.commit-timestamp)"
taskRef:
params:
- name: name
Expand Down Expand Up @@ -303,6 +310,12 @@ spec:
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
- name: PLATFORM
value: linux/s390x
- name: BUILDAH_FORMAT
value: $(params.buildah-format)
- name: LABELS
value: ["$(params.extra-labels[*])"]
- name: BUILD_TIMESTAMP
value: "$(tasks.clone-repository.results.commit-timestamp)"
taskRef:
params:
- name: name
Expand Down Expand Up @@ -344,6 +357,12 @@ spec:
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
- name: PLATFORM
value: linux/ppc64le
- name: BUILDAH_FORMAT
value: $(params.buildah-format)
- name: LABELS
value: ["$(params.extra-labels[*])"]
- name: BUILD_TIMESTAMP
value: "$(tasks.clone-repository.results.commit-timestamp)"
taskRef:
params:
- name: name
Expand Down Expand Up @@ -385,6 +404,12 @@ spec:
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
- name: PLATFORM
value: linux-c2xlarge/arm64
- name: BUILDAH_FORMAT
value: $(params.buildah-format)
- name: LABELS
value: ["$(params.extra-labels[*])"]
- name: BUILD_TIMESTAMP
value: "$(tasks.clone-repository.results.commit-timestamp)"
taskRef:
params:
- name: name
Expand Down
8 changes: 3 additions & 5 deletions collector/container/konflux.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,15 @@ ARG COLLECTOR_TAG
WORKDIR /

LABEL \
com.redhat.component="rhacs-collector-container" \
com.redhat.license_terms="https://www.redhat.com/agreements" \
description="This image supports runtime data collection for Red Hat Advanced Cluster Security for Kubernetes" \
distribution-scope="public" \
io.k8s.description="This image supports runtime data collection for Red Hat Advanced Cluster Security for Kubernetes" \
io.k8s.display-name="collector" \
io.openshift.tags="rhacs,collector,stackrox" \
maintainer="Red Hat, Inc." \
name="advanced-cluster-security/rhacs-collector-rhel8" \
# Custom Snapshot creation in `operator-bundle-pipeline` depends on source-location label to be set correctly.
source-location="https://github.com/stackrox/collector" \
summary="Runtime data collection for Red Hat Advanced Cluster Security for Kubernetes" \
Expand All @@ -123,8 +126,3 @@ COPY LICENSE /licenses/LICENSE
EXPOSE 8080 9090

ENTRYPOINT ["collector"]

LABEL \
com.redhat.component="rhacs-collector-container" \
io.k8s.display-name="collector" \
name="rhacs-collector-rhel8"
Loading