Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ require (
go.opentelemetry.io/otel/trace v1.37.0
go.uber.org/atomic v1.10.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.27.0
go.uber.org/zap v1.27.1
golang.org/x/net v0.41.0
golang.org/x/sync v0.15.0
k8s.io/api v0.33.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -595,8 +595,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
Expand Down
8 changes: 4 additions & 4 deletions openshift/ci-operator/build-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"]
13 changes: 8 additions & 5 deletions openshift/ci-operator/knative-images/appender/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"]
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"]
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"]
13 changes: 8 additions & 5 deletions openshift/ci-operator/knative-images/controller/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"]
13 changes: 8 additions & 5 deletions openshift/ci-operator/knative-images/event_display/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"]
13 changes: 8 additions & 5 deletions openshift/ci-operator/knative-images/filter/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"]
13 changes: 8 additions & 5 deletions openshift/ci-operator/knative-images/heartbeats/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"]
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"]
13 changes: 8 additions & 5 deletions openshift/ci-operator/knative-images/ingress/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT! Generated Dockerfile for cmd/broker/ingress.
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

Expand All @@ -23,14 +23,17 @@ COPY LICENSE /licenses/
USER 65532

LABEL \
com.redhat.component="openshift-serverless-1-eventing-broker-ingress-rhel8-container" \
name="openshift-serverless-1/eventing-broker-ingress-rhel8" \
com.redhat.component="openshift-serverless-1-kn-eventing-ingress-rhel9-container" \
name="openshift-serverless-1/kn-eventing-ingress-rhel9" \
version=$VERSION \
summary="Red Hat OpenShift Serverless 1 Eventing Broker Ingress" \
maintainer="[email protected]" \
description="Red Hat OpenShift Serverless 1 Eventing Broker Ingress" \
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Broker Ingress" \
io.k8s.description="Red Hat OpenShift Serverless Eventing Broker Ingress" \
io.openshift.tags="broker-ingress"
io.openshift.tags="broker-ingress" \
vendor="Red Hat, Inc." \
release=$VERSION \
cpe="cpe:/a:redhat:openshift_serverless:1.39::el9"

ENTRYPOINT ["/usr/bin/ingress"]
13 changes: 8 additions & 5 deletions openshift/ci-operator/knative-images/jobsink/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DO NOT EDIT! Generated Dockerfile for cmd/jobsink.
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

Expand All @@ -23,14 +23,17 @@ COPY LICENSE /licenses/
USER 65532

LABEL \
com.redhat.component="openshift-serverless-1-eventing-jobsink-rhel8-container" \
name="openshift-serverless-1/eventing-jobsink-rhel8" \
com.redhat.component="openshift-serverless-1-kn-eventing-jobsink-rhel9-container" \
name="openshift-serverless-1/kn-eventing-jobsink-rhel9" \
version=$VERSION \
summary="Red Hat OpenShift Serverless 1 Eventing Jobsink" \
maintainer="[email protected]" \
description="Red Hat OpenShift Serverless 1 Eventing Jobsink" \
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Jobsink" \
io.k8s.description="Red Hat OpenShift Serverless Eventing Jobsink" \
io.openshift.tags="jobsink"
io.openshift.tags="jobsink" \
vendor="Red Hat, Inc." \
release=$VERSION \
cpe="cpe:/a:redhat:openshift_serverless:1.39::el9"

ENTRYPOINT ["/usr/bin/jobsink"]
Loading