[release-v1.19][gomod]: Bump github.com/cloudevents/sdk-go/observability/opentelemetry/v2 from 2.16.1 to 2.16.2

go.mod

@@ -6,10 +6,10 @@ require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.3.1-0.20210420163308-c1402a70e2f1
 	github.com/cert-manager/cert-manager v1.16.3
 	github.com/cloudevents/conformance v0.4.1
-	github.com/cloudevents/sdk-go/observability/opentelemetry/v2 v2.16.1
+	github.com/cloudevents/sdk-go/observability/opentelemetry/v2 v2.16.2
 	github.com/cloudevents/sdk-go/protocol/mqtt_paho/v2 v2.0.0-20240508060731-1ed9471c98bd
 	github.com/cloudevents/sdk-go/sql/v2 v2.0.0-20240712172937-3ce6b2f1f011
-	github.com/cloudevents/sdk-go/v2 v2.16.1
+	github.com/cloudevents/sdk-go/v2 v2.16.2
 	github.com/coreos/go-oidc/v3 v3.9.0
 	github.com/eclipse/paho.golang v0.12.0
 	github.com/go-jose/go-jose/v3 v3.0.4
@@ -27,7 +27,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/rickb777/date v1.13.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/stretchr/testify v1.10.0
+	github.com/stretchr/testify v1.11.0
 	github.com/wavesoftware/go-ensure v1.0.0
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0
 	go.opentelemetry.io/contrib/instrumentation/runtime v0.62.0
@@ -40,7 +40,7 @@ require (
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/net v0.41.0
-	golang.org/x/sync v0.15.0
+	golang.org/x/sync v0.16.0
 	k8s.io/api v0.33.3
 	k8s.io/apiextensions-apiserver v0.33.3
 	k8s.io/apimachinery v0.33.3

go.sum

@@ -102,14 +102,14 @@ github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudevents/conformance v0.4.1 h1:MMq+jviOHHNINGWQdvr2yj4g8CdeL59M81ODjEs9M20=
 github.com/cloudevents/conformance v0.4.1/go.mod h1:bOMTKxs/Aqx4rM/dp+AYvdGTHU6tEa9+R5ORr5cJnqc=
-github.com/cloudevents/sdk-go/observability/opentelemetry/v2 v2.16.1 h1:bm82HgAOzK9VSrVtC0lWWrrQLJaRYqqAKEIx2jdPQbU=
-github.com/cloudevents/sdk-go/observability/opentelemetry/v2 v2.16.1/go.mod h1:H46knbku1a1zLw3lAsaWdtVryvG1/QaNZRCRO69elKA=
+github.com/cloudevents/sdk-go/observability/opentelemetry/v2 v2.16.2 h1:iXVFmEH44Ty0JS0B8NqYqK4joKol+L4axc1+u/35faw=
+github.com/cloudevents/sdk-go/observability/opentelemetry/v2 v2.16.2/go.mod h1:v1jS/Cp9zkcWZqn1HCQFH0gr/3bETyp44YNYOVLJOBU=
 github.com/cloudevents/sdk-go/protocol/mqtt_paho/v2 v2.0.0-20240508060731-1ed9471c98bd h1:MGVlnkCz/b0vjfkM5tSVLD+4oaUnYuVEjiW6lAMJ9IM=
 github.com/cloudevents/sdk-go/protocol/mqtt_paho/v2 v2.0.0-20240508060731-1ed9471c98bd/go.mod h1:s+KZsVZst0bVW6vuKYb8CH49CcSJDO09+ZiIeKzJmqE=
 github.com/cloudevents/sdk-go/sql/v2 v2.0.0-20240712172937-3ce6b2f1f011 h1:mx6avAROtrV9yTlBBH4Y8IAmspmcz9v44Pkcrjq0tAA=
 github.com/cloudevents/sdk-go/sql/v2 v2.0.0-20240712172937-3ce6b2f1f011/go.mod h1:oqJ9+L9IXySYb8PN6M/g/K8y/WdVQunmmZhJnlLFcCk=
-github.com/cloudevents/sdk-go/v2 v2.16.1 h1:G91iUdqvl88BZ1GYYr9vScTj5zzXSyEuqbfE63gbu9Q=
-github.com/cloudevents/sdk-go/v2 v2.16.1/go.mod h1:v/kVOaWjNfbvc6tkhhlkhvLapj8Aa8kvXiH5GiOHCKI=
+github.com/cloudevents/sdk-go/v2 v2.16.2 h1:ZYDFrYke4FD+jM8TZTJJO6JhKHzOQl2oqpFK1D+NnQM=
+github.com/cloudevents/sdk-go/v2 v2.16.2/go.mod h1:laOcGImm4nVJEU+PHnUrKL56CKmRL65RlQF0kRmW/kg=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
@@ -520,8 +520,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8=
+github.com/stretchr/testify v1.11.0/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
@@ -735,8 +735,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
-golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
+golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

openshift/ci-operator/build-image/Dockerfile

@@ -1,17 +1,17 @@
 # DO NOT EDIT! Generated Dockerfile.
 
-FROM registry.ci.openshift.org/ocp/4.17:cli-artifacts as tools
+FROM registry.ci.openshift.org/ocp/4.19:cli-artifacts as tools
 
 # Dockerfile to bootstrap build and test in openshift-ci
-FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.24-openshift-4.20 as builder
+FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20 as builder
 
 ARG TARGETARCH
 
-COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel8 /usr/bin/oc
+COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel9 /usr/bin/oc
 
 RUN ln -s /usr/bin/oc /usr/bin/kubectl
 
-RUN yum install -y httpd-tools
+RUN dnf install -y httpd-tools
 
 RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && \
     chmod 700 ./get-helm-3

openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile

@@ -1,6 +1,6 @@
 # DO NOT EDIT! Generated Dockerfile for cmd/apiserver_receive_adapter.
-ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.24-openshift-4.20
-ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
+ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
 
 FROM $GO_BUILDER as builder
 
@@ -23,14 +23,17 @@ COPY LICENSE /licenses/
 USER 65532
 
 LABEL \
-      com.redhat.component="openshift-serverless-1-eventing-apiserver-receive-adapter-rhel8-container" \
-      name="openshift-serverless-1/eventing-apiserver-receive-adapter-rhel8" \
+      com.redhat.component="openshift-serverless-1-kn-eventing-apiserver-receive-adapter-rhel9-container" \
+      name="openshift-serverless-1/kn-eventing-apiserver-receive-adapter-rhel9" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter" \
       maintainer="[email protected]" \
       description="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Apiserver Receive Adapter" \
-      io.openshift.tags="apiserver-receive-adapter"
+      io.openshift.tags="apiserver-receive-adapter" \
+      vendor="Red Hat, Inc." \
+      release=$VERSION \
+      cpe="cpe:/a:redhat:openshift_serverless:1.39::el9"
 
 ENTRYPOINT ["/usr/bin/apiserver_receive_adapter"]

openshift/ci-operator/knative-images/appender/Dockerfile

@@ -1,6 +1,6 @@
 # DO NOT EDIT! Generated Dockerfile for cmd/appender.
-ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.24-openshift-4.20
-ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
+ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
 
 FROM $GO_BUILDER as builder
 
@@ -23,14 +23,17 @@ COPY LICENSE /licenses/
 USER 65532
 
 LABEL \
-      com.redhat.component="openshift-serverless-1-eventing-appender-rhel8-container" \
-      name="openshift-serverless-1/eventing-appender-rhel8" \
+      com.redhat.component="openshift-serverless-1-eventing-appender-rhel9-container" \
+      name="openshift-serverless-1/eventing-appender-rhel9" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Appender" \
       maintainer="[email protected]" \
       description="Red Hat OpenShift Serverless 1 Eventing Appender" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Appender" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Appender" \
-      io.openshift.tags="appender"
+      io.openshift.tags="appender" \
+      vendor="Red Hat, Inc." \
+      release=$VERSION \
+      cpe="cpe:/a:redhat:openshift_serverless:1.39::el9"
 
 ENTRYPOINT ["/usr/bin/appender"]

openshift/ci-operator/knative-images/channel_controller/Dockerfile

@@ -1,6 +1,6 @@
 # DO NOT EDIT! Generated Dockerfile for cmd/in_memory/channel_controller.
-ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.24-openshift-4.20
-ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
+ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
 
 FROM $GO_BUILDER as builder
 
@@ -23,14 +23,17 @@ COPY LICENSE /licenses/
 USER 65532
 
 LABEL \
-      com.redhat.component="openshift-serverless-1-eventing-in-memory-channel-controller-rhel8-container" \
-      name="openshift-serverless-1/eventing-in-memory-channel-controller-rhel8" \
+      com.redhat.component="openshift-serverless-1-kn-eventing-in-memory-channel-controller-rhel9-container" \
+      name="openshift-serverless-1/kn-eventing-in-memory-channel-controller-rhel9" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Controller" \
       maintainer="[email protected]" \
       description="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Controller" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Controller" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing In Memory Channel Controller" \
-      io.openshift.tags="in-memory-channel-controller"
+      io.openshift.tags="in-memory-channel-controller" \
+      vendor="Red Hat, Inc." \
+      release=$VERSION \
+      cpe="cpe:/a:redhat:openshift_serverless:1.39::el9"
 
 ENTRYPOINT ["/usr/bin/channel_controller"]

openshift/ci-operator/knative-images/channel_dispatcher/Dockerfile

@@ -1,6 +1,6 @@
 # DO NOT EDIT! Generated Dockerfile for cmd/in_memory/channel_dispatcher.
-ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.24-openshift-4.20
-ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
+ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
 
 FROM $GO_BUILDER as builder
 
@@ -23,14 +23,17 @@ COPY LICENSE /licenses/
 USER 65532
 
 LABEL \
-      com.redhat.component="openshift-serverless-1-eventing-in-memory-channel-dispatcher-rhel8-container" \
-      name="openshift-serverless-1/eventing-in-memory-channel-dispatcher-rhel8" \
+      com.redhat.component="openshift-serverless-1-kn-eventing-channel-dispatcher-rhel9-container" \
+      name="openshift-serverless-1/kn-eventing-channel-dispatcher-rhel9" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Dispatcher" \
       maintainer="[email protected]" \
       description="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Dispatcher" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Dispatcher" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing In Memory Channel Dispatcher" \
-      io.openshift.tags="in-memory-channel-dispatcher"
+      io.openshift.tags="in-memory-channel-dispatcher" \
+      vendor="Red Hat, Inc." \
+      release=$VERSION \
+      cpe="cpe:/a:redhat:openshift_serverless:1.39::el9"
 
 ENTRYPOINT ["/usr/bin/channel_dispatcher"]

openshift/ci-operator/knative-images/controller/Dockerfile

@@ -1,6 +1,6 @@
 # DO NOT EDIT! Generated Dockerfile for cmd/controller.
-ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.24-openshift-4.20
-ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
+ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
 
 FROM $GO_BUILDER as builder
 
@@ -23,14 +23,17 @@ COPY LICENSE /licenses/
 USER 65532
 
 LABEL \
-      com.redhat.component="openshift-serverless-1-eventing-controller-rhel8-container" \
-      name="openshift-serverless-1/eventing-controller-rhel8" \
+      com.redhat.component="openshift-serverless-1-kn-eventing-controller-rhel9-container" \
+      name="openshift-serverless-1/kn-eventing-controller-rhel9" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Controller" \
       maintainer="[email protected]" \
       description="Red Hat OpenShift Serverless 1 Eventing Controller" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Controller" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Controller" \
-      io.openshift.tags="controller"
+      io.openshift.tags="controller" \
+      vendor="Red Hat, Inc." \
+      release=$VERSION \
+      cpe="cpe:/a:redhat:openshift_serverless:1.39::el9"
 
 ENTRYPOINT ["/usr/bin/controller"]

openshift/ci-operator/knative-images/event_display/Dockerfile

@@ -1,6 +1,6 @@
 # DO NOT EDIT! Generated Dockerfile for cmd/event_display.
-ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.24-openshift-4.20
-ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
+ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
 
 FROM $GO_BUILDER as builder
 
@@ -23,14 +23,17 @@ COPY LICENSE /licenses/
 USER 65532
 
 LABEL \
-      com.redhat.component="openshift-serverless-1-eventing-event-display-rhel8-container" \
-      name="openshift-serverless-1/eventing-event-display-rhel8" \
+      com.redhat.component="openshift-serverless-1-eventing-event-display-rhel9-container" \
+      name="openshift-serverless-1/eventing-event-display-rhel9" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Event Display" \
       maintainer="[email protected]" \
       description="Red Hat OpenShift Serverless 1 Eventing Event Display" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Event Display" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Event Display" \
-      io.openshift.tags="event-display"
+      io.openshift.tags="event-display" \
+      vendor="Red Hat, Inc." \
+      release=$VERSION \
+      cpe="cpe:/a:redhat:openshift_serverless:1.39::el9"
 
 ENTRYPOINT ["/usr/bin/event_display"]

openshift/ci-operator/knative-images/filter/Dockerfile

@@ -1,6 +1,6 @@
 # DO NOT EDIT! Generated Dockerfile for cmd/broker/filter.
-ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.24-openshift-4.20
-ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
+ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
 
 FROM $GO_BUILDER as builder
 
@@ -23,14 +23,17 @@ COPY LICENSE /licenses/
 USER 65532
 
 LABEL \
-      com.redhat.component="openshift-serverless-1-eventing-broker-filter-rhel8-container" \
-      name="openshift-serverless-1/eventing-broker-filter-rhel8" \
+      com.redhat.component="openshift-serverless-1-kn-eventing-filter-rhel9-container" \
+      name="openshift-serverless-1/kn-eventing-filter-rhel9" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Broker Filter" \
       maintainer="[email protected]" \
       description="Red Hat OpenShift Serverless 1 Eventing Broker Filter" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Broker Filter" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Broker Filter" \
-      io.openshift.tags="broker-filter"
+      io.openshift.tags="broker-filter" \
+      vendor="Red Hat, Inc." \
+      release=$VERSION \
+      cpe="cpe:/a:redhat:openshift_serverless:1.39::el9"
 
 ENTRYPOINT ["/usr/bin/filter"]

openshift/ci-operator/knative-images/heartbeats/Dockerfile

@@ -1,6 +1,6 @@
 # DO NOT EDIT! Generated Dockerfile for cmd/heartbeats.
-ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.24-openshift-4.20
-ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
+ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
 
 FROM $GO_BUILDER as builder
 
@@ -23,14 +23,17 @@ COPY LICENSE /licenses/
 USER 65532
 
 LABEL \
-      com.redhat.component="openshift-serverless-1-eventing-heartbeats-rhel8-container" \
-      name="openshift-serverless-1/eventing-heartbeats-rhel8" \
+      com.redhat.component="openshift-serverless-1-eventing-heartbeats-rhel9-container" \
+      name="openshift-serverless-1/eventing-heartbeats-rhel9" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Heartbeats" \
       maintainer="[email protected]" \
       description="Red Hat OpenShift Serverless 1 Eventing Heartbeats" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Heartbeats" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Heartbeats" \
-      io.openshift.tags="heartbeats"
+      io.openshift.tags="heartbeats" \
+      vendor="Red Hat, Inc." \
+      release=$VERSION \
+      cpe="cpe:/a:redhat:openshift_serverless:1.39::el9"
 
 ENTRYPOINT ["/usr/bin/heartbeats"]

openshift/ci-operator/knative-images/heartbeats_receiver/Dockerfile

@@ -1,6 +1,6 @@
 # DO NOT EDIT! Generated Dockerfile for cmd/heartbeats_receiver.
-ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.24-openshift-4.20
-ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
+ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
 
 FROM $GO_BUILDER as builder
 
@@ -23,14 +23,17 @@ COPY LICENSE /licenses/
 USER 65532
 
 LABEL \
-      com.redhat.component="openshift-serverless-1-eventing-heartbeats-receiver-rhel8-container" \
-      name="openshift-serverless-1/eventing-heartbeats-receiver-rhel8" \
+      com.redhat.component="openshift-serverless-1-eventing-heartbeats-receiver-rhel9-container" \
+      name="openshift-serverless-1/eventing-heartbeats-receiver-rhel9" \
       version=$VERSION \
       summary="Red Hat OpenShift Serverless 1 Eventing Heartbeats Receiver" \
       maintainer="[email protected]" \
       description="Red Hat OpenShift Serverless 1 Eventing Heartbeats Receiver" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Heartbeats Receiver" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Heartbeats Receiver" \
-      io.openshift.tags="heartbeats-receiver"
+      io.openshift.tags="heartbeats-receiver" \
+      vendor="Red Hat, Inc." \
+      release=$VERSION \
+      cpe="cpe:/a:redhat:openshift_serverless:1.39::el9"
 
 ENTRYPOINT ["/usr/bin/heartbeats_receiver"]