Skip to content

Commit 3a350b2

Browse files
authored
chore(KONFLUX-6210): fix and set name and cpe label for CO (#816)
For https://issues.redhat.com/browse/KONFLUX-6210, clair needs access to a name and cpe label that it can use to look up the image in VEX statements. See also release-engineering/rhtap-ec-policy#149
1 parent f037525 commit 3a350b2

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

bundle.openshift.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ FROM scratch
1717

1818
ARG CO_NEW_VERSION
1919

20-
LABEL name=openshift-compliance-operator-bundle
20+
LABEL name=compliance/openshift-compliance-operator-bundle
2121
LABEL version=${CO_NEW_VERSION}
2222
LABEL summary='OpenShift Compliance Operator'
2323
LABEL maintainer='Infrastructure Security and Compliance Team <isc-team@redhat.com>'
@@ -31,6 +31,7 @@ LABEL url="https://github.com/ComplianceAsCode/compliance-operator"
3131
LABEL distribution-scope=public
3232

3333
LABEL com.redhat.component=openshift-compliance-operator-bundle-container
34+
LABEL cpe=cpe:/a:redhat:openshift_compliance_operator:1::el9
3435
LABEL com.redhat.delivery.appregistry=false
3536
LABEL com.redhat.delivery.operator.bundle=true
3637
LABEL com.redhat.openshift.versions="v4.10"

images/must-gather/Containerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ LABEL \
99
description="An image to collect debug information from compliance-operator" \
1010
maintainer="Red Hat ISC <isc-team@redhat.com>" \
1111
License="GPLv2+" \
12-
name="openshift-compliance-must-gather" \
12+
name="compliance/openshift-compliance-must-gather-rhel8" \
13+
cpe="cpe:/a:redhat:openshift_compliance_operator:1::el9" \
1314
com.redhat.component="openshift-compliance-must-gather-container" \
1415
io.openshift.maintainer.product="OpenShift Container Platform" \
1516
io.openshift.maintainer.component="Compliance Operator" \

images/openscap/Containerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ LABEL \
99
description="An OpenSCAP operand for the compliance-operator" \
1010
maintainer="Red Hat ISC <isc-team@redhat.com>" \
1111
License="GPLv2+" \
12-
name="openshift-compliance-openscap" \
12+
name="compliance/openshift-compliance-openscap-rhel8" \
13+
cpe="cpe:/a:redhat:openshift_compliance_operator:1::el9" \
1314
com.redhat.component="openshift-compliance-openscap-container" \
1415
io.openshift.maintainer.product="OpenShift Container Platform" \
1516
io.openshift.maintainer.component="Compliance Operator" \

images/operator/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ LABEL \
2222
description="An operator that performs compliance scanning and remediation on a cluster" \
2323
maintainer="Red Hat ISC <isc-team@redhat.com>" \
2424
License="GPLv2+" \
25-
name="openshift-compliance-operator" \
25+
name="compliance/openshift-compliance-rhel8-operator" \
26+
cpe="cpe:/a:redhat:openshift_compliance_operator:1::el9" \
2627
com.redhat.component="openshift-compliance-operator-container" \
2728
io.openshift.maintainer.product="OpenShift Container Platform" \
2829
io.openshift.maintainer.component="Compliance Operator" \

0 commit comments

Comments
 (0)