From 0864ebe27e25ef97fc1e68de7549986f8750e664 Mon Sep 17 00:00:00 2001 From: Serverless QE Robot <86025630+serverless-qe@users.noreply.github.com> Date: Tue, 3 Sep 2024 12:07:39 +0200 Subject: [PATCH] Run `make generate-release` (#780) Co-authored-by: mgencur --- .../apiserver_receive_adapter/Dockerfile | 30 ++++++++++++++----- .../knative-images/appender/Dockerfile | 30 ++++++++++++++----- .../channel_controller/Dockerfile | 30 ++++++++++++++----- .../channel_dispatcher/Dockerfile | 30 ++++++++++++++----- .../knative-images/controller/Dockerfile | 30 ++++++++++++++----- .../knative-images/event_display/Dockerfile | 30 ++++++++++++++----- .../knative-images/filter/Dockerfile | 30 ++++++++++++++----- .../knative-images/heartbeats/Dockerfile | 30 ++++++++++++++----- .../heartbeats_receiver/Dockerfile | 30 ++++++++++++++----- .../knative-images/ingress/Dockerfile | 30 ++++++++++++++----- .../knative-images/jobsink/Dockerfile | 30 ++++++++++++++----- .../knative-images/migrate/Dockerfile | 30 ++++++++++++++----- .../knative-images/mqttsource/Dockerfile | 30 ++++++++++++++----- .../mtchannel_broker/Dockerfile | 30 ++++++++++++++----- .../knative-images/mtping/Dockerfile | 30 ++++++++++++++----- .../knative-images/pong/Dockerfile | 30 ++++++++++++++----- .../knative-images/schema/Dockerfile | 30 ++++++++++++++----- .../knative-images/webhook/Dockerfile | 30 ++++++++++++++----- .../knative-images/websocketsource/Dockerfile | 30 ++++++++++++++----- .../event-sender/Dockerfile | 30 ++++++++++++++----- .../knative-test-images/eventshub/Dockerfile | 30 ++++++++++++++----- .../knative-test-images/print/Dockerfile | 30 ++++++++++++++----- .../recordevents/Dockerfile | 30 ++++++++++++++----- .../request-sender/Dockerfile | 30 ++++++++++++++----- .../wathola-fetcher/Dockerfile | 30 ++++++++++++++----- .../wathola-forwarder/Dockerfile | 30 ++++++++++++++----- .../wathola-receiver/Dockerfile | 30 ++++++++++++++----- .../wathola-sender/Dockerfile | 30 ++++++++++++++----- .../release/artifacts/eventing-core.yaml | 3 ++ 29 files changed, 619 insertions(+), 224 deletions(-) diff --git a/openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile b/openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile index 02c5e7040d8..d9504e89a1a 100755 --- a/openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile +++ b/openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/apiserver_receive_adapter. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p cmd/apiserver_receive_adapter/kodata && \ - go build -o /usr/bin/main ./cmd/apiserver_receive_adapter && \ - cp -r cmd/apiserver_receive_adapter/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/apiserver_receive_adapter + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-apiserver-receive-adapter-rhel8-container" \ + name="openshift-serverless-1/eventing-apiserver-receive-adapter-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/appender/Dockerfile b/openshift/ci-operator/knative-images/appender/Dockerfile index 65a04fd49a9..75293800279 100755 --- a/openshift/ci-operator/knative-images/appender/Dockerfile +++ b/openshift/ci-operator/knative-images/appender/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/appender. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p cmd/appender/kodata && \ - go build -o /usr/bin/main ./cmd/appender && \ - cp -r cmd/appender/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/appender + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-appender-rhel8-container" \ + name="openshift-serverless-1/eventing-appender-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Appender" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Appender" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Appender" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/channel_controller/Dockerfile b/openshift/ci-operator/knative-images/channel_controller/Dockerfile index 93664191204..39fd8cc5262 100755 --- a/openshift/ci-operator/knative-images/channel_controller/Dockerfile +++ b/openshift/ci-operator/knative-images/channel_controller/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/in_memory/channel_controller. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p cmd/in_memory/channel_controller/kodata && \ - go build -o /usr/bin/main ./cmd/in_memory/channel_controller && \ - cp -r cmd/in_memory/channel_controller/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/in_memory/channel_controller + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-in-memory-channel-controller-rhel8-container" \ + name="openshift-serverless-1/eventing-in-memory-channel-controller-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Controller" \ + maintainer="serverless-support@redhat.com" \ + 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" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/channel_dispatcher/Dockerfile b/openshift/ci-operator/knative-images/channel_dispatcher/Dockerfile index 98404385585..555edc6c059 100755 --- a/openshift/ci-operator/knative-images/channel_dispatcher/Dockerfile +++ b/openshift/ci-operator/knative-images/channel_dispatcher/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/in_memory/channel_dispatcher. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p cmd/in_memory/channel_dispatcher/kodata && \ - go build -o /usr/bin/main ./cmd/in_memory/channel_dispatcher && \ - cp -r cmd/in_memory/channel_dispatcher/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/in_memory/channel_dispatcher + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-in-memory-channel-dispatcher-rhel8-container" \ + name="openshift-serverless-1/eventing-in-memory-channel-dispatcher-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Dispatcher" \ + maintainer="serverless-support@redhat.com" \ + 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" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/controller/Dockerfile b/openshift/ci-operator/knative-images/controller/Dockerfile index a35d6b4bf67..42609739d73 100755 --- a/openshift/ci-operator/knative-images/controller/Dockerfile +++ b/openshift/ci-operator/knative-images/controller/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/controller. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p cmd/controller/kodata && \ - go build -o /usr/bin/main ./cmd/controller && \ - cp -r cmd/controller/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/controller + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-controller-rhel8-container" \ + name="openshift-serverless-1/eventing-controller-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Controller" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Controller" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Controller" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/event_display/Dockerfile b/openshift/ci-operator/knative-images/event_display/Dockerfile index a6ef531c451..20ccdb5ca66 100755 --- a/openshift/ci-operator/knative-images/event_display/Dockerfile +++ b/openshift/ci-operator/knative-images/event_display/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/event_display. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p cmd/event_display/kodata && \ - go build -o /usr/bin/main ./cmd/event_display && \ - cp -r cmd/event_display/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/event_display + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-event-display-rhel8-container" \ + name="openshift-serverless-1/eventing-event-display-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Event Display" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Event Display" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Event Display" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/filter/Dockerfile b/openshift/ci-operator/knative-images/filter/Dockerfile index 70a8977623c..b11c2147e3e 100755 --- a/openshift/ci-operator/knative-images/filter/Dockerfile +++ b/openshift/ci-operator/knative-images/filter/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/broker/filter. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p cmd/broker/filter/kodata && \ - go build -o /usr/bin/main ./cmd/broker/filter && \ - cp -r cmd/broker/filter/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/broker/filter + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-broker-filter-rhel8-container" \ + name="openshift-serverless-1/eventing-broker-filter-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Broker Filter" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Broker Filter" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Broker Filter" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/heartbeats/Dockerfile b/openshift/ci-operator/knative-images/heartbeats/Dockerfile index 6d7a30b72df..9dc7a955926 100755 --- a/openshift/ci-operator/knative-images/heartbeats/Dockerfile +++ b/openshift/ci-operator/knative-images/heartbeats/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/heartbeats. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p cmd/heartbeats/kodata && \ - go build -o /usr/bin/main ./cmd/heartbeats && \ - cp -r cmd/heartbeats/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/heartbeats + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-heartbeats-rhel8-container" \ + name="openshift-serverless-1/eventing-heartbeats-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Heartbeats" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Heartbeats" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Heartbeats" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/heartbeats_receiver/Dockerfile b/openshift/ci-operator/knative-images/heartbeats_receiver/Dockerfile index 806c93443fb..ef736a83b62 100755 --- a/openshift/ci-operator/knative-images/heartbeats_receiver/Dockerfile +++ b/openshift/ci-operator/knative-images/heartbeats_receiver/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/heartbeats_receiver. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p cmd/heartbeats_receiver/kodata && \ - go build -o /usr/bin/main ./cmd/heartbeats_receiver && \ - cp -r cmd/heartbeats_receiver/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/heartbeats_receiver + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-heartbeats-receiver-rhel8-container" \ + name="openshift-serverless-1/eventing-heartbeats-receiver-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Heartbeats Receiver" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Heartbeats Receiver" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Heartbeats Receiver" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/ingress/Dockerfile b/openshift/ci-operator/knative-images/ingress/Dockerfile index 95757d4ecf2..b946f3b485d 100755 --- a/openshift/ci-operator/knative-images/ingress/Dockerfile +++ b/openshift/ci-operator/knative-images/ingress/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/broker/ingress. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p cmd/broker/ingress/kodata && \ - go build -o /usr/bin/main ./cmd/broker/ingress && \ - cp -r cmd/broker/ingress/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/broker/ingress + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-broker-ingress-rhel8-container" \ + name="openshift-serverless-1/eventing-broker-ingress-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Broker Ingress" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Broker Ingress" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Broker Ingress" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/jobsink/Dockerfile b/openshift/ci-operator/knative-images/jobsink/Dockerfile index 1995de96752..4914b5ce344 100755 --- a/openshift/ci-operator/knative-images/jobsink/Dockerfile +++ b/openshift/ci-operator/knative-images/jobsink/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/jobsink. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p cmd/jobsink/kodata && \ - go build -o /usr/bin/main ./cmd/jobsink && \ - cp -r cmd/jobsink/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/jobsink + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-jobsink-rhel8-container" \ + name="openshift-serverless-1/eventing-jobsink-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Jobsink" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Jobsink" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Jobsink" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/migrate/Dockerfile b/openshift/ci-operator/knative-images/migrate/Dockerfile index 54753318f67..8690d5ef603 100755 --- a/openshift/ci-operator/knative-images/migrate/Dockerfile +++ b/openshift/ci-operator/knative-images/migrate/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/pkg/apiextensions/storageversion/cmd/migrate. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p vendor/knative.dev/pkg/apiextensions/storageversion/cmd/migrate/kodata && \ - go build -o /usr/bin/main ./vendor/knative.dev/pkg/apiextensions/storageversion/cmd/migrate && \ - cp -r vendor/knative.dev/pkg/apiextensions/storageversion/cmd/migrate/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/pkg/apiextensions/storageversion/cmd/migrate + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-migrate-rhel8-container" \ + name="openshift-serverless-1/eventing-migrate-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Migrate" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Migrate" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Migrate" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/mqttsource/Dockerfile b/openshift/ci-operator/knative-images/mqttsource/Dockerfile index 6d4afcfff69..69fdbc0b9f7 100755 --- a/openshift/ci-operator/knative-images/mqttsource/Dockerfile +++ b/openshift/ci-operator/knative-images/mqttsource/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/mqttsource. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p cmd/mqttsource/kodata && \ - go build -o /usr/bin/main ./cmd/mqttsource && \ - cp -r cmd/mqttsource/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/mqttsource + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-mqttsource-rhel8-container" \ + name="openshift-serverless-1/eventing-mqttsource-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Mqttsource" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Mqttsource" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Mqttsource" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/mtchannel_broker/Dockerfile b/openshift/ci-operator/knative-images/mtchannel_broker/Dockerfile index 7029726dc65..28c987395b1 100755 --- a/openshift/ci-operator/knative-images/mtchannel_broker/Dockerfile +++ b/openshift/ci-operator/knative-images/mtchannel_broker/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/mtchannel_broker. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p cmd/mtchannel_broker/kodata && \ - go build -o /usr/bin/main ./cmd/mtchannel_broker && \ - cp -r cmd/mtchannel_broker/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/mtchannel_broker + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-mtchannel-broker-rhel8-container" \ + name="openshift-serverless-1/eventing-mtchannel-broker-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Mtchannel Broker" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Mtchannel Broker" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Mtchannel Broker" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/mtping/Dockerfile b/openshift/ci-operator/knative-images/mtping/Dockerfile index fdd348fb2a4..849f7993000 100755 --- a/openshift/ci-operator/knative-images/mtping/Dockerfile +++ b/openshift/ci-operator/knative-images/mtping/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/mtping. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p cmd/mtping/kodata && \ - go build -o /usr/bin/main ./cmd/mtping && \ - cp -r cmd/mtping/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/mtping + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-mtping-rhel8-container" \ + name="openshift-serverless-1/eventing-mtping-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Mtping" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Mtping" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Mtping" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/pong/Dockerfile b/openshift/ci-operator/knative-images/pong/Dockerfile index 34a95f1ca3c..e09a5049e32 100755 --- a/openshift/ci-operator/knative-images/pong/Dockerfile +++ b/openshift/ci-operator/knative-images/pong/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/pong. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p cmd/pong/kodata && \ - go build -o /usr/bin/main ./cmd/pong && \ - cp -r cmd/pong/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/pong + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-pong-rhel8-container" \ + name="openshift-serverless-1/eventing-pong-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Pong" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Pong" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Pong" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/schema/Dockerfile b/openshift/ci-operator/knative-images/schema/Dockerfile index d35b2eb141f..dfdd7791ccb 100755 --- a/openshift/ci-operator/knative-images/schema/Dockerfile +++ b/openshift/ci-operator/knative-images/schema/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/schema. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p cmd/schema/kodata && \ - go build -o /usr/bin/main ./cmd/schema && \ - cp -r cmd/schema/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/schema + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-schema-rhel8-container" \ + name="openshift-serverless-1/eventing-schema-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Schema" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Schema" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Schema" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/webhook/Dockerfile b/openshift/ci-operator/knative-images/webhook/Dockerfile index 9c6a52ba2dd..96943d352a2 100755 --- a/openshift/ci-operator/knative-images/webhook/Dockerfile +++ b/openshift/ci-operator/knative-images/webhook/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/webhook. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p cmd/webhook/kodata && \ - go build -o /usr/bin/main ./cmd/webhook && \ - cp -r cmd/webhook/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/webhook + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-webhook-rhel8-container" \ + name="openshift-serverless-1/eventing-webhook-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Webhook" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Webhook" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Webhook" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-images/websocketsource/Dockerfile b/openshift/ci-operator/knative-images/websocketsource/Dockerfile index 9c18e6fd70d..c6fcf22aaaf 100755 --- a/openshift/ci-operator/knative-images/websocketsource/Dockerfile +++ b/openshift/ci-operator/knative-images/websocketsource/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for cmd/websocketsource. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p cmd/websocketsource/kodata && \ - go build -o /usr/bin/main ./cmd/websocketsource && \ - cp -r cmd/websocketsource/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/websocketsource + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-websocketsource-rhel8-container" \ + name="openshift-serverless-1/eventing-websocketsource-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Websocketsource" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Websocketsource" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Websocketsource" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/event-sender/Dockerfile b/openshift/ci-operator/knative-test-images/event-sender/Dockerfile index 3a4eae90740..501538efed0 100755 --- a/openshift/ci-operator/knative-test-images/event-sender/Dockerfile +++ b/openshift/ci-operator/knative-test-images/event-sender/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for test/test_images/event-sender. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p test/test_images/event-sender/kodata && \ - go build -o /usr/bin/main ./test/test_images/event-sender && \ - cp -r test/test_images/event-sender/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/event-sender + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-test-test-images-event-sender-rhel8-container" \ + name="openshift-serverless-1/eventing-test-test-images-event-sender-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Test Test Images Event Sender" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Test Test Images Event Sender" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Test Test Images Event Sender" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/eventshub/Dockerfile b/openshift/ci-operator/knative-test-images/eventshub/Dockerfile index ae1f77cc176..212dc37b22c 100755 --- a/openshift/ci-operator/knative-test-images/eventshub/Dockerfile +++ b/openshift/ci-operator/knative-test-images/eventshub/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/reconciler-test/cmd/eventshub. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p vendor/knative.dev/reconciler-test/cmd/eventshub/kodata && \ - go build -o /usr/bin/main ./vendor/knative.dev/reconciler-test/cmd/eventshub && \ - cp -r vendor/knative.dev/reconciler-test/cmd/eventshub/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/reconciler-test/cmd/eventshub + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-eventshub-rhel8-container" \ + name="openshift-serverless-1/eventing-eventshub-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Eventshub" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Eventshub" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Eventshub" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/print/Dockerfile b/openshift/ci-operator/knative-test-images/print/Dockerfile index 9a7e05233bb..4471ab955c9 100755 --- a/openshift/ci-operator/knative-test-images/print/Dockerfile +++ b/openshift/ci-operator/knative-test-images/print/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for test/test_images/print. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p test/test_images/print/kodata && \ - go build -o /usr/bin/main ./test/test_images/print && \ - cp -r test/test_images/print/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/print + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-test-test-images-print-rhel8-container" \ + name="openshift-serverless-1/eventing-test-test-images-print-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Test Test Images Print" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Test Test Images Print" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Test Test Images Print" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/recordevents/Dockerfile b/openshift/ci-operator/knative-test-images/recordevents/Dockerfile index a4d3588bb7d..e0b5ba0a6a0 100755 --- a/openshift/ci-operator/knative-test-images/recordevents/Dockerfile +++ b/openshift/ci-operator/knative-test-images/recordevents/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for test/test_images/recordevents. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p test/test_images/recordevents/kodata && \ - go build -o /usr/bin/main ./test/test_images/recordevents && \ - cp -r test/test_images/recordevents/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/recordevents + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-test-test-images-recordevents-rhel8-container" \ + name="openshift-serverless-1/eventing-test-test-images-recordevents-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Test Test Images Recordevents" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Test Test Images Recordevents" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Test Test Images Recordevents" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/request-sender/Dockerfile b/openshift/ci-operator/knative-test-images/request-sender/Dockerfile index b60fcff5c0c..f09ad8f4a43 100755 --- a/openshift/ci-operator/knative-test-images/request-sender/Dockerfile +++ b/openshift/ci-operator/knative-test-images/request-sender/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for test/test_images/request-sender. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p test/test_images/request-sender/kodata && \ - go build -o /usr/bin/main ./test/test_images/request-sender && \ - cp -r test/test_images/request-sender/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/request-sender + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-test-test-images-request-sender-rhel8-container" \ + name="openshift-serverless-1/eventing-test-test-images-request-sender-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Test Test Images Request Sender" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Test Test Images Request Sender" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Test Test Images Request Sender" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile index 7793d693264..39e034b731c 100755 --- a/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for test/test_images/wathola-fetcher. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p test/test_images/wathola-fetcher/kodata && \ - go build -o /usr/bin/main ./test/test_images/wathola-fetcher && \ - cp -r test/test_images/wathola-fetcher/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/wathola-fetcher + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-test-test-images-wathola-fetcher-rhel8-container" \ + name="openshift-serverless-1/eventing-test-test-images-wathola-fetcher-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Fetcher" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Fetcher" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Fetcher" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile index cc1f17782b5..c2f10fac37d 100755 --- a/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for test/test_images/wathola-forwarder. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p test/test_images/wathola-forwarder/kodata && \ - go build -o /usr/bin/main ./test/test_images/wathola-forwarder && \ - cp -r test/test_images/wathola-forwarder/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/wathola-forwarder + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-test-test-images-wathola-forwarder-rhel8-container" \ + name="openshift-serverless-1/eventing-test-test-images-wathola-forwarder-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Forwarder" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Forwarder" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Forwarder" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile index c0822ebbf45..14ebb061bc3 100755 --- a/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for test/test_images/wathola-receiver. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p test/test_images/wathola-receiver/kodata && \ - go build -o /usr/bin/main ./test/test_images/wathola-receiver && \ - cp -r test/test_images/wathola-receiver/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/wathola-receiver + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-test-test-images-wathola-receiver-rhel8-container" \ + name="openshift-serverless-1/eventing-test-test-images-wathola-receiver-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Receiver" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Receiver" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Receiver" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile index bd882860ced..c697a61f241 100755 --- a/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile @@ -1,20 +1,34 @@ # DO NOT EDIT! Generated Dockerfile for test/test_images/wathola-sender. -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 +ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal + +FROM $GO_BUILDER as builder COPY . . -RUN mkdir -p /var/run/ko && \ - mkdir -p test/test_images/wathola-sender/kodata && \ - go build -o /usr/bin/main ./test/test_images/wathola-sender && \ - cp -r test/test_images/wathola-sender/kodata /var/run/ko +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/wathola-sender + +FROM $GO_RUNTIME -FROM registry.access.redhat.com/ubi8/ubi-minimal +ARG VERSION=knative-v1.15 -# install the missing zoneinfo to ubi-minimal +# Install zoneinfo. RUN microdnf install tzdata USER 65532 COPY --from=builder /usr/bin/main /usr/bin/main -COPY --from=builder /var/run/ko /var/run/ko + +LABEL \ + com.redhat.component="openshift-serverless-1-eventing-test-test-images-wathola-sender-rhel8-container" \ + name="openshift-serverless-1/eventing-test-test-images-wathola-sender-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Sender" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Sender" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Test Test Images Wathola Sender" + ENTRYPOINT ["/usr/bin/main"] diff --git a/openshift/release/artifacts/eventing-core.yaml b/openshift/release/artifacts/eventing-core.yaml index 015d12a837b..eb9e0dbe21a 100644 --- a/openshift/release/artifacts/eventing-core.yaml +++ b/openshift/release/artifacts/eventing-core.yaml @@ -7120,3 +7120,6 @@ metadata: app.kubernetes.io/version: v1.15 app.kubernetes.io/name: knative-eventing config.openshift.io/inject-trusted-cabundle: "true" + networking.knative.dev/trust-bundle: "true" + annotations: + "openshift.io/owning-component": "Serverless Operator"