From 1855b5546e22b8e2bd87dbeb195c478fb6d8228a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Oct 2025 01:33:39 +0000 Subject: [PATCH 1/2] [release-v1.18][maven]: Bump the major group across 1 directory with 11 updates Bumps the major group with 11 updates in the /data-plane directory: | Package | From | To | | --- | --- | --- | | org.apache.kafka:kafka-clients | `3.9.0` | `4.1.0` | | org.apache.kafka:kafka_2.13 | `3.9.0` | `4.1.0` | | [com.squareup.okhttp3:mockwebserver](https://github.com/square/okhttp) | `4.12.0` | `5.2.1` | | [net.logstash.logback:logstash-logback-encoder](https://github.com/logfellow/logstash-logback-encoder) | `8.0` | `9.0` | | [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) | `3.25.5` | `4.33.0` | | com.google.protobuf:protobuf-java-util | `3.25.5` | `4.33.0` | | [com.github.vladimir-bukhtoyarov:bucket4j-core](https://github.com/vladimir-bukhtoyarov/bucket4j) | `7.6.0` | `8.0.1` | | [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) | `5.10.5` | `6.0.0` | | [org.junit.jupiter:junit-jupiter-migrationsupport](https://github.com/junit-team/junit-framework) | `5.10.5` | `6.0.0` | | [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin) | `4.1` | `5.0.0` | | [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) | `2.38.0` | `3.0.0` | Updates `org.apache.kafka:kafka-clients` from 3.9.0 to 4.1.0 Updates `org.apache.kafka:kafka_2.13` from 3.9.0 to 4.1.0 Updates `com.squareup.okhttp3:mockwebserver` from 4.12.0 to 5.2.1 - [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/okhttp/compare/parent-4.12.0...parent-5.2.1) Updates `net.logstash.logback:logstash-logback-encoder` from 8.0 to 9.0 - [Release notes](https://github.com/logfellow/logstash-logback-encoder/releases) - [Commits](https://github.com/logfellow/logstash-logback-encoder/compare/logstash-logback-encoder-8.0...logstash-logback-encoder-9.0) Updates `com.google.protobuf:protobuf-java` from 3.25.5 to 4.33.0 - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/commits) Updates `com.google.protobuf:protobuf-java-util` from 3.25.5 to 4.33.0 Updates `com.google.protobuf:protobuf-java-util` from 3.25.5 to 4.33.0 Updates `com.github.vladimir-bukhtoyarov:bucket4j-core` from 7.6.0 to 8.0.1 - [Release notes](https://github.com/vladimir-bukhtoyarov/bucket4j/releases) - [Commits](https://github.com/vladimir-bukhtoyarov/bucket4j/compare/7.6.0...8.0.1) Updates `org.junit.jupiter:junit-jupiter` from 5.10.5 to 6.0.0 - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r5.10.5...r6.0.0) Updates `org.junit.jupiter:junit-jupiter-migrationsupport` from 5.10.5 to 6.0.0 - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r5.10.5...r6.0.0) Updates `org.junit.jupiter:junit-jupiter-migrationsupport` from 5.10.5 to 6.0.0 - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r5.10.5...r6.0.0) Updates `org.apache.kafka:kafka_2.13` from 3.9.0 to 4.1.0 Updates `com.mycila:license-maven-plugin` from 4.1 to 5.0.0 - [Release notes](https://github.com/mathieucarbou/license-maven-plugin/releases) - [Commits](https://github.com/mathieucarbou/license-maven-plugin/compare/license-maven-plugin-4.1...v5.0.0) Updates `com.diffplug.spotless:spotless-maven-plugin` from 2.38.0 to 3.0.0 - [Release notes](https://github.com/diffplug/spotless/releases) - [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md) - [Commits](https://github.com/diffplug/spotless/compare/lib/2.38.0...lib/3.0.0) --- updated-dependencies: - dependency-name: org.apache.kafka:kafka-clients dependency-version: 4.1.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: major - dependency-name: org.apache.kafka:kafka_2.13 dependency-version: 4.1.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: major - dependency-name: com.squareup.okhttp3:mockwebserver dependency-version: 5.2.1 dependency-type: direct:development update-type: version-update:semver-major dependency-group: major - dependency-name: net.logstash.logback:logstash-logback-encoder dependency-version: '9.0' dependency-type: direct:production update-type: version-update:semver-major dependency-group: major - dependency-name: com.google.protobuf:protobuf-java dependency-version: 4.33.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: major - dependency-name: com.google.protobuf:protobuf-java-util dependency-version: 4.33.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: major - dependency-name: com.google.protobuf:protobuf-java-util dependency-version: 4.33.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: major - dependency-name: com.github.vladimir-bukhtoyarov:bucket4j-core dependency-version: 8.0.1 dependency-type: direct:production update-type: version-update:semver-major dependency-group: major - dependency-name: org.junit.jupiter:junit-jupiter dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: major - dependency-name: org.junit.jupiter:junit-jupiter-migrationsupport dependency-version: 6.0.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: major - dependency-name: org.junit.jupiter:junit-jupiter-migrationsupport dependency-version: 6.0.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: major - dependency-name: org.apache.kafka:kafka_2.13 dependency-version: 4.1.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: major - dependency-name: com.mycila:license-maven-plugin dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: major - dependency-name: com.diffplug.spotless:spotless-maven-plugin dependency-version: 3.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: major ... Signed-off-by: dependabot[bot] --- data-plane/pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/data-plane/pom.xml b/data-plane/pom.xml index 0e5194c392..1451815af2 100644 --- a/data-plane/pom.xml +++ b/data-plane/pom.xml @@ -38,8 +38,8 @@ 0.8.12 3.5.0 2.0.0 - 4.1 - 2.38.0 + 5.0.0 + 3.0.0 4.5.14 @@ -47,17 +47,17 @@ 1.14.6 1.42.1 2.14.1 - 3.25.5 - 7.6.0 + 4.33.0 + 8.0.1 2.0.17 1.5.18 - 8.0 + 9.0 3.27.3 4.2.0 - 5.10.5 + 6.0.0 5.17.0 7.1.0 - 3.9.0 + 4.1.0 3.0.7.Final 3.4.5 3.21.2 @@ -226,14 +226,14 @@ mockwebserver com.squareup.okhttp3 - 4.12.0 + 5.2.1 test mockwebserver com.squareup.okhttp3 - 4.12.0 + 5.2.1 test From da53391308f8e267b7bb5a2b6fdf8483eaf011f0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 27 Oct 2025 01:37:47 +0000 Subject: [PATCH 2/2] Run make generate-release --- openshift/ci-operator/build-image/Dockerfile | 8 ++++---- .../knative-images/event_display/Dockerfile | 11 ++++++----- .../ci-operator/knative-images/heartbeats/Dockerfile | 11 ++++++----- .../knative-images/kafka-controller/Dockerfile | 11 ++++++----- .../knative-images/kafka-source-controller/Dockerfile | 11 ++++++----- .../ci-operator/knative-images/migrate/Dockerfile | 11 ++++++----- .../knative-images/post-install/Dockerfile | 11 ++++++----- .../knative-images/webhook-kafka/Dockerfile | 11 ++++++----- .../knative-test-images/committed-offset/Dockerfile | 11 ++++++----- .../consumer-group-lag-provider-test/Dockerfile | 11 ++++++----- .../knative-test-images/event-sender/Dockerfile | 11 ++++++----- .../knative-test-images/eventshub/Dockerfile | 11 ++++++----- .../knative-test-images/kafka-consumer/Dockerfile | 11 ++++++----- .../knative-test-images/logs-exporter/Dockerfile | 11 ++++++----- .../ci-operator/knative-test-images/print/Dockerfile | 11 ++++++----- .../knative-test-images/recordevents/Dockerfile | 11 ++++++----- .../knative-test-images/request-sender/Dockerfile | 11 ++++++----- .../knative-test-images/watch-cm/Dockerfile | 11 ++++++----- .../knative-test-images/wathola-fetcher/Dockerfile | 11 ++++++----- .../knative-test-images/wathola-forwarder/Dockerfile | 11 ++++++----- .../knative-test-images/wathola-receiver/Dockerfile | 11 ++++++----- .../knative-test-images/wathola-sender/Dockerfile | 11 ++++++----- 22 files changed, 130 insertions(+), 109 deletions(-) diff --git a/openshift/ci-operator/build-image/Dockerfile b/openshift/ci-operator/build-image/Dockerfile index ab85eae897..69718c03fe 100755 --- a/openshift/ci-operator/build-image/Dockerfile +++ b/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.23-openshift-4.19 as builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 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 diff --git a/openshift/ci-operator/knative-images/event_display/Dockerfile b/openshift/ci-operator/knative-images/event_display/Dockerfile index e5c6550bd7..ecf36b4250 100755 --- a/openshift/ci-operator/knative-images/event_display/Dockerfile +++ b/openshift/ci-operator/knative-images/event_display/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/cmd/event_display. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-event-display-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-event-display-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-event-display-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-event-display-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Event Display" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Event Display" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Event Display" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Event Display" \ - io.openshift.tags="event-display" + io.openshift.tags="event-display" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/event_display"] diff --git a/openshift/ci-operator/knative-images/heartbeats/Dockerfile b/openshift/ci-operator/knative-images/heartbeats/Dockerfile index 456f8c9091..c281db7a72 100755 --- a/openshift/ci-operator/knative-images/heartbeats/Dockerfile +++ b/openshift/ci-operator/knative-images/heartbeats/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/cmd/heartbeats. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-heartbeats-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-heartbeats-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-heartbeats-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-heartbeats-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Heartbeats" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Heartbeats" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Heartbeats" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Heartbeats" \ - io.openshift.tags="heartbeats" + io.openshift.tags="heartbeats" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/heartbeats"] diff --git a/openshift/ci-operator/knative-images/kafka-controller/Dockerfile b/openshift/ci-operator/knative-images/kafka-controller/Dockerfile index 115f0213c9..de4db0e4d0 100755 --- a/openshift/ci-operator/knative-images/kafka-controller/Dockerfile +++ b/openshift/ci-operator/knative-images/kafka-controller/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for control-plane/cmd/kafka-controller. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-kafka-controller-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-kafka-controller-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-kafka-controller-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-kafka-controller-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Controller" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Controller" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Controller" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Kafka Controller" \ - io.openshift.tags="kafka-controller" + io.openshift.tags="kafka-controller" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/kafka-controller"] diff --git a/openshift/ci-operator/knative-images/kafka-source-controller/Dockerfile b/openshift/ci-operator/knative-images/kafka-source-controller/Dockerfile index 03ac99560d..7bac9ee114 100755 --- a/openshift/ci-operator/knative-images/kafka-source-controller/Dockerfile +++ b/openshift/ci-operator/knative-images/kafka-source-controller/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for control-plane/cmd/kafka-source-controller. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-kafka-source-controller-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-kafka-source-controller-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-kafka-source-controller-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-kafka-source-controller-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Source Controller" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Source Controller" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Source Controller" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Kafka Source Controller" \ - io.openshift.tags="kafka-source-controller" + io.openshift.tags="kafka-source-controller" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/kafka-source-controller"] diff --git a/openshift/ci-operator/knative-images/migrate/Dockerfile b/openshift/ci-operator/knative-images/migrate/Dockerfile index e5f313a833..0b40ae97e4 100755 --- a/openshift/ci-operator/knative-images/migrate/Dockerfile +++ b/openshift/ci-operator/knative-images/migrate/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/pkg/apiextensions/storageversion/cmd/migrate. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-migrate-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-migrate-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-migrate-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-migrate-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Migrate" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Migrate" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Migrate" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Migrate" \ - io.openshift.tags="migrate" + io.openshift.tags="migrate" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/migrate"] diff --git a/openshift/ci-operator/knative-images/post-install/Dockerfile b/openshift/ci-operator/knative-images/post-install/Dockerfile index 3f250a77e3..be2c3827dc 100755 --- a/openshift/ci-operator/knative-images/post-install/Dockerfile +++ b/openshift/ci-operator/knative-images/post-install/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for control-plane/cmd/post-install. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-post-install-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-post-install-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-post-install-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-post-install-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Post Install" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Post Install" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Post Install" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Post Install" \ - io.openshift.tags="post-install" + io.openshift.tags="post-install" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/post-install"] diff --git a/openshift/ci-operator/knative-images/webhook-kafka/Dockerfile b/openshift/ci-operator/knative-images/webhook-kafka/Dockerfile index 2c562695da..1cd361d50f 100755 --- a/openshift/ci-operator/knative-images/webhook-kafka/Dockerfile +++ b/openshift/ci-operator/knative-images/webhook-kafka/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for control-plane/cmd/webhook-kafka. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-webhook-kafka-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-webhook-kafka-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-webhook-kafka-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-webhook-kafka-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Webhook Kafka" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Webhook Kafka" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Webhook Kafka" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Webhook Kafka" \ - io.openshift.tags="webhook-kafka" + io.openshift.tags="webhook-kafka" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/webhook-kafka"] diff --git a/openshift/ci-operator/knative-test-images/committed-offset/Dockerfile b/openshift/ci-operator/knative-test-images/committed-offset/Dockerfile index b32ed95e48..5e2fd5f275 100755 --- a/openshift/ci-operator/knative-test-images/committed-offset/Dockerfile +++ b/openshift/ci-operator/knative-test-images/committed-offset/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for test/test_images/committed-offset. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-test-test-images-committed-offset-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-test-test-images-committed-offset-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-test-test-images-committed-offset-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-test-test-images-committed-offset-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Committed Offset" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Committed Offset" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Committed Offset" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Test Test Images Committed Offset" \ - io.openshift.tags="test-test-images-committed-offset" + io.openshift.tags="test-test-images-committed-offset" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/committed-offset"] diff --git a/openshift/ci-operator/knative-test-images/consumer-group-lag-provider-test/Dockerfile b/openshift/ci-operator/knative-test-images/consumer-group-lag-provider-test/Dockerfile index 42b55bf957..c3edbfd0c2 100755 --- a/openshift/ci-operator/knative-test-images/consumer-group-lag-provider-test/Dockerfile +++ b/openshift/ci-operator/knative-test-images/consumer-group-lag-provider-test/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for test/test_images/consumer-group-lag-provider-test. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-test-test-images-consumer-group-lag-provider-test-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-test-test-images-consumer-group-lag-provider-test-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-test-test-images-consumer-group-lag-provider-test-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-test-test-images-consumer-group-lag-provider-test-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Consumer Group Lag Provider Test" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Consumer Group Lag Provider Test" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Consumer Group Lag Provider Test" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Test Test Images Consumer Group Lag Provider Test" \ - io.openshift.tags="test-test-images-consumer-group-lag-provider-test" + io.openshift.tags="test-test-images-consumer-group-lag-provider-test" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/consumer-group-lag-provider-test"] diff --git a/openshift/ci-operator/knative-test-images/event-sender/Dockerfile b/openshift/ci-operator/knative-test-images/event-sender/Dockerfile index 1ceb582d4e..86b2fbd4a3 100755 --- a/openshift/ci-operator/knative-test-images/event-sender/Dockerfile +++ b/openshift/ci-operator/knative-test-images/event-sender/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/test/test_images/event-sender. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-event-sender-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-event-sender-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-event-sender-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-event-sender-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Event Sender" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Event Sender" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Event Sender" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Event Sender" \ - io.openshift.tags="vendor-knative.dev-eventing-test-test-images-event-sender" + io.openshift.tags="vendor-knative.dev-eventing-test-test-images-event-sender" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/event-sender"] diff --git a/openshift/ci-operator/knative-test-images/eventshub/Dockerfile b/openshift/ci-operator/knative-test-images/eventshub/Dockerfile index 88c1e9b3b8..9b13b7e7e2 100755 --- a/openshift/ci-operator/knative-test-images/eventshub/Dockerfile +++ b/openshift/ci-operator/knative-test-images/eventshub/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/reconciler-test/cmd/eventshub. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-eventshub-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-eventshub-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-eventshub-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-eventshub-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Eventshub" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Eventshub" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Eventshub" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Eventshub" \ - io.openshift.tags="eventshub" + io.openshift.tags="eventshub" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/eventshub"] diff --git a/openshift/ci-operator/knative-test-images/kafka-consumer/Dockerfile b/openshift/ci-operator/knative-test-images/kafka-consumer/Dockerfile index 02f5c98364..287ffcf6ff 100755 --- a/openshift/ci-operator/knative-test-images/kafka-consumer/Dockerfile +++ b/openshift/ci-operator/knative-test-images/kafka-consumer/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for test/test_images/kafka-consumer. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-test-test-images-kafka-consumer-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-test-test-images-kafka-consumer-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-test-test-images-kafka-consumer-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-test-test-images-kafka-consumer-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Kafka Consumer" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Kafka Consumer" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Kafka Consumer" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Test Test Images Kafka Consumer" \ - io.openshift.tags="test-test-images-kafka-consumer" + io.openshift.tags="test-test-images-kafka-consumer" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/kafka-consumer"] diff --git a/openshift/ci-operator/knative-test-images/logs-exporter/Dockerfile b/openshift/ci-operator/knative-test-images/logs-exporter/Dockerfile index 37e250b4e1..ab8c166934 100755 --- a/openshift/ci-operator/knative-test-images/logs-exporter/Dockerfile +++ b/openshift/ci-operator/knative-test-images/logs-exporter/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for test/cmd/logs-exporter. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-logs-exporter-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-logs-exporter-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-logs-exporter-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-logs-exporter-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Logs Exporter" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Logs Exporter" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Logs Exporter" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Logs Exporter" \ - io.openshift.tags="logs-exporter" + io.openshift.tags="logs-exporter" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/logs-exporter"] diff --git a/openshift/ci-operator/knative-test-images/print/Dockerfile b/openshift/ci-operator/knative-test-images/print/Dockerfile index e472434236..972ce23709 100755 --- a/openshift/ci-operator/knative-test-images/print/Dockerfile +++ b/openshift/ci-operator/knative-test-images/print/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/test/test_images/print. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-print-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-print-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-print-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-print-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Print" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Print" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Print" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Print" \ - io.openshift.tags="vendor-knative.dev-eventing-test-test-images-print" + io.openshift.tags="vendor-knative.dev-eventing-test-test-images-print" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/print"] diff --git a/openshift/ci-operator/knative-test-images/recordevents/Dockerfile b/openshift/ci-operator/knative-test-images/recordevents/Dockerfile index 23603726e9..cf91fc60f3 100755 --- a/openshift/ci-operator/knative-test-images/recordevents/Dockerfile +++ b/openshift/ci-operator/knative-test-images/recordevents/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/test/test_images/recordevents. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-recordevents-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-recordevents-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-recordevents-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-recordevents-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Recordevents" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Recordevents" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Recordevents" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Recordevents" \ - io.openshift.tags="vendor-knative.dev-eventing-test-test-images-recordevents" + io.openshift.tags="vendor-knative.dev-eventing-test-test-images-recordevents" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/recordevents"] diff --git a/openshift/ci-operator/knative-test-images/request-sender/Dockerfile b/openshift/ci-operator/knative-test-images/request-sender/Dockerfile index a27476bbb5..edb31e0a17 100755 --- a/openshift/ci-operator/knative-test-images/request-sender/Dockerfile +++ b/openshift/ci-operator/knative-test-images/request-sender/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/test/test_images/request-sender. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-request-sender-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-request-sender-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-request-sender-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-request-sender-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Request Sender" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Request Sender" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Request Sender" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Request Sender" \ - io.openshift.tags="vendor-knative.dev-eventing-test-test-images-request-sender" + io.openshift.tags="vendor-knative.dev-eventing-test-test-images-request-sender" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/request-sender"] diff --git a/openshift/ci-operator/knative-test-images/watch-cm/Dockerfile b/openshift/ci-operator/knative-test-images/watch-cm/Dockerfile index e6e3926cf6..c585c069b8 100755 --- a/openshift/ci-operator/knative-test-images/watch-cm/Dockerfile +++ b/openshift/ci-operator/knative-test-images/watch-cm/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for test/cmd/watch-cm. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-watch-cm-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-watch-cm-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-watch-cm-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-watch-cm-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Watch Cm" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Watch Cm" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Watch Cm" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Watch Cm" \ - io.openshift.tags="watch-cm" + io.openshift.tags="watch-cm" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/watch-cm"] diff --git a/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile index 593ffe0ca7..2647f49c63 100755 --- a/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/test/test_images/wathola-fetcher. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-fetcher-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-fetcher-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-fetcher-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-fetcher-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Fetcher" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Fetcher" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Fetcher" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Fetcher" \ - io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-fetcher" + io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-fetcher" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/wathola-fetcher"] diff --git a/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile index 78e8ac32e2..0e0c3ecf10 100755 --- a/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/test/test_images/wathola-forwarder. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-forwarder-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-forwarder-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-forwarder-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-forwarder-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Forwarder" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Forwarder" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Forwarder" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Forwarder" \ - io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-forwarder" + io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-forwarder" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/wathola-forwarder"] diff --git a/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile index b26d2fcfbd..5541789ed3 100755 --- a/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/test/test_images/wathola-receiver. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-receiver-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-receiver-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-receiver-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-receiver-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Receiver" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Receiver" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Receiver" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Receiver" \ - io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-receiver" + io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-receiver" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/wathola-receiver"] diff --git a/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile index bc4f232a7c..991886fc99 100755 --- a/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/eventing/test/test_images/wathola-sender. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -22,14 +22,15 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-sender-rhel8-container" \ - name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-sender-rhel8" \ + com.redhat.component="openshift-serverless-1-eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-sender-rhel9-container" \ + name="openshift-serverless-1/eventing-kafka-broker-vendor-knative.dev-eventing-test-test-images-wathola-sender-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Sender" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Sender" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Sender" \ io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Sender" \ - io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-sender" + io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-sender" \ + cpe="cpe:/a:redhat:openshift_serverless:1.38::el9" ENTRYPOINT ["/usr/bin/wathola-sender"]