From c26f1ba80cf72806bd12cb22b397c48d6066e855 Mon Sep 17 00:00:00 2001 From: serverless-qe Date: Wed, 15 Jan 2025 17:14:14 +0000 Subject: [PATCH] Run make generate-release --- .../apiserver_receive_adapter/Dockerfile | 2 + .../knative-images/appender/Dockerfile | 2 + .../channel_controller/Dockerfile | 2 + .../channel_dispatcher/Dockerfile | 2 + .../knative-images/controller/Dockerfile | 2 + .../knative-images/event_display/Dockerfile | 2 + .../knative-images/filter/Dockerfile | 2 + .../knative-images/heartbeats/Dockerfile | 2 + .../heartbeats_receiver/Dockerfile | 2 + .../knative-images/ingress/Dockerfile | 2 + .../knative-images/jobsink/Dockerfile | 2 + .../knative-images/migrate/Dockerfile | 2 + .../knative-images/mqttsource/Dockerfile | 2 + .../mtchannel_broker/Dockerfile | 2 + .../knative-images/mtping/Dockerfile | 2 + .../knative-images/pong/Dockerfile | 2 + .../knative-images/schema/Dockerfile | 2 + .../knative-images/webhook/Dockerfile | 2 + .../knative-images/websocketsource/Dockerfile | 2 + .../event-sender/Dockerfile | 2 + .../knative-test-images/eventshub/Dockerfile | 2 + .../knative-test-images/print/Dockerfile | 2 + .../recordevents/Dockerfile | 2 + .../request-sender/Dockerfile | 2 + .../wathola-fetcher/Dockerfile | 2 + .../wathola-forwarder/Dockerfile | 2 + .../wathola-receiver/Dockerfile | 2 + .../wathola-sender/Dockerfile | 2 + .../release/artifacts/eventing-core.yaml | 2 +- rpms.lock.yaml | 77 +++++++++++++++++++ .../pkg/controller/stats_reporter.go | 4 +- .../knative.dev/pkg/webhook/stats_reporter.go | 5 +- 32 files changed, 138 insertions(+), 6 deletions(-) create mode 100644 rpms.lock.yaml diff --git a/openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile b/openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile index 3df95973830..2e410be3529 100755 --- a/openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile +++ b/openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/apiserver_receive_adapter +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/appender/Dockerfile b/openshift/ci-operator/knative-images/appender/Dockerfile index 9404f8700cd..b427bd343d2 100755 --- a/openshift/ci-operator/knative-images/appender/Dockerfile +++ b/openshift/ci-operator/knative-images/appender/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/appender +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/channel_controller/Dockerfile b/openshift/ci-operator/knative-images/channel_controller/Dockerfile index 0d9167686ee..fb8de7b1c0d 100755 --- a/openshift/ci-operator/knative-images/channel_controller/Dockerfile +++ b/openshift/ci-operator/knative-images/channel_controller/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/channel_controller +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/channel_dispatcher/Dockerfile b/openshift/ci-operator/knative-images/channel_dispatcher/Dockerfile index 3de286a91d5..6ad45bf20a5 100755 --- a/openshift/ci-operator/knative-images/channel_dispatcher/Dockerfile +++ b/openshift/ci-operator/knative-images/channel_dispatcher/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/channel_dispatcher +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/controller/Dockerfile b/openshift/ci-operator/knative-images/controller/Dockerfile index 3767467d61a..2bd174661c8 100755 --- a/openshift/ci-operator/knative-images/controller/Dockerfile +++ b/openshift/ci-operator/knative-images/controller/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/controller +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/event_display/Dockerfile b/openshift/ci-operator/knative-images/event_display/Dockerfile index a8a44c21cfb..5bf802b7972 100755 --- a/openshift/ci-operator/knative-images/event_display/Dockerfile +++ b/openshift/ci-operator/knative-images/event_display/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/event_display +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/filter/Dockerfile b/openshift/ci-operator/knative-images/filter/Dockerfile index a4d9e372cd6..cc18141103f 100755 --- a/openshift/ci-operator/knative-images/filter/Dockerfile +++ b/openshift/ci-operator/knative-images/filter/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/filter +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/heartbeats/Dockerfile b/openshift/ci-operator/knative-images/heartbeats/Dockerfile index be7fd099dc0..3ef947f41b5 100755 --- a/openshift/ci-operator/knative-images/heartbeats/Dockerfile +++ b/openshift/ci-operator/knative-images/heartbeats/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/heartbeats +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/heartbeats_receiver/Dockerfile b/openshift/ci-operator/knative-images/heartbeats_receiver/Dockerfile index 6f927adf149..e06c3c49f4b 100755 --- a/openshift/ci-operator/knative-images/heartbeats_receiver/Dockerfile +++ b/openshift/ci-operator/knative-images/heartbeats_receiver/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/heartbeats_receiver +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/ingress/Dockerfile b/openshift/ci-operator/knative-images/ingress/Dockerfile index 80f9ae13ad6..cffd3e0bb20 100755 --- a/openshift/ci-operator/knative-images/ingress/Dockerfile +++ b/openshift/ci-operator/knative-images/ingress/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/ingress +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/jobsink/Dockerfile b/openshift/ci-operator/knative-images/jobsink/Dockerfile index 445b733a5ca..3c88b5c0c38 100755 --- a/openshift/ci-operator/knative-images/jobsink/Dockerfile +++ b/openshift/ci-operator/knative-images/jobsink/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/jobsink +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/migrate/Dockerfile b/openshift/ci-operator/knative-images/migrate/Dockerfile index 96532356a53..3539c14c0a0 100755 --- a/openshift/ci-operator/knative-images/migrate/Dockerfile +++ b/openshift/ci-operator/knative-images/migrate/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/migrate +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/mqttsource/Dockerfile b/openshift/ci-operator/knative-images/mqttsource/Dockerfile index b8c2ce2062c..dd019b0db38 100755 --- a/openshift/ci-operator/knative-images/mqttsource/Dockerfile +++ b/openshift/ci-operator/knative-images/mqttsource/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/mqttsource +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/mtchannel_broker/Dockerfile b/openshift/ci-operator/knative-images/mtchannel_broker/Dockerfile index d716df24af6..42ad057f3f4 100755 --- a/openshift/ci-operator/knative-images/mtchannel_broker/Dockerfile +++ b/openshift/ci-operator/knative-images/mtchannel_broker/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/mtchannel_broker +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/mtping/Dockerfile b/openshift/ci-operator/knative-images/mtping/Dockerfile index e2ca4242c60..1cd55b7aa31 100755 --- a/openshift/ci-operator/knative-images/mtping/Dockerfile +++ b/openshift/ci-operator/knative-images/mtping/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/mtping +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/pong/Dockerfile b/openshift/ci-operator/knative-images/pong/Dockerfile index f46e8c575be..38c92188c39 100755 --- a/openshift/ci-operator/knative-images/pong/Dockerfile +++ b/openshift/ci-operator/knative-images/pong/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/pong +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/schema/Dockerfile b/openshift/ci-operator/knative-images/schema/Dockerfile index 2caa99b2978..d57168cf603 100755 --- a/openshift/ci-operator/knative-images/schema/Dockerfile +++ b/openshift/ci-operator/knative-images/schema/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/schema +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/webhook/Dockerfile b/openshift/ci-operator/knative-images/webhook/Dockerfile index a44cde1992f..6450b76cc2b 100755 --- a/openshift/ci-operator/knative-images/webhook/Dockerfile +++ b/openshift/ci-operator/knative-images/webhook/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/webhook +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-images/websocketsource/Dockerfile b/openshift/ci-operator/knative-images/websocketsource/Dockerfile index 53f05070643..8ad18605f47 100755 --- a/openshift/ci-operator/knative-images/websocketsource/Dockerfile +++ b/openshift/ci-operator/knative-images/websocketsource/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/websocketsource +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-test-images/event-sender/Dockerfile b/openshift/ci-operator/knative-test-images/event-sender/Dockerfile index a5223bffa67..8efb3dfaea6 100755 --- a/openshift/ci-operator/knative-test-images/event-sender/Dockerfile +++ b/openshift/ci-operator/knative-test-images/event-sender/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/event-sender +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-test-images/eventshub/Dockerfile b/openshift/ci-operator/knative-test-images/eventshub/Dockerfile index 7663aaf683b..01a7b48867a 100755 --- a/openshift/ci-operator/knative-test-images/eventshub/Dockerfile +++ b/openshift/ci-operator/knative-test-images/eventshub/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/eventshub +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-test-images/print/Dockerfile b/openshift/ci-operator/knative-test-images/print/Dockerfile index fd45e247fc0..14607260766 100755 --- a/openshift/ci-operator/knative-test-images/print/Dockerfile +++ b/openshift/ci-operator/knative-test-images/print/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/print +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-test-images/recordevents/Dockerfile b/openshift/ci-operator/knative-test-images/recordevents/Dockerfile index d263a7ec030..18ee9722637 100755 --- a/openshift/ci-operator/knative-test-images/recordevents/Dockerfile +++ b/openshift/ci-operator/knative-test-images/recordevents/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/recordevents +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-test-images/request-sender/Dockerfile b/openshift/ci-operator/knative-test-images/request-sender/Dockerfile index 009d72b0f07..84e8d781943 100755 --- a/openshift/ci-operator/knative-test-images/request-sender/Dockerfile +++ b/openshift/ci-operator/knative-test-images/request-sender/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/request-sender +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile index eb161f455bf..df465ef1b09 100755 --- a/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/wathola-fetcher +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile index 86bbcc9d513..b59996c22ed 100755 --- a/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/wathola-forwarder +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile index 23112d98dba..f4c82d24bed 100755 --- a/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/wathola-receiver +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile index 5e2c57b295f..49b81fa641e 100755 --- a/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile +++ b/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile @@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal FROM $GO_BUILDER as builder +WORKDIR /workspace COPY . . ENV CGO_ENABLED=1 @@ -17,6 +18,7 @@ ARG VERSION=knative-v1.16 RUN microdnf update tzdata -y && microdnf reinstall tzdata -y COPY --from=builder /usr/bin/main /usr/bin/wathola-sender +COPY LICENSE /licenses/ USER 65532 diff --git a/openshift/release/artifacts/eventing-core.yaml b/openshift/release/artifacts/eventing-core.yaml index 65533411eae..661655d7291 100644 --- a/openshift/release/artifacts/eventing-core.yaml +++ b/openshift/release/artifacts/eventing-core.yaml @@ -175,7 +175,7 @@ metadata: name: jobsinks-addressable-resolver labels: duck.knative.dev/addressable: "true" - app.kubernetes.io/version: v1.15 + app.kubernetes.io/version: v1.16 app.kubernetes.io/name: knative-eventing # Do not use this role directly. These rules will be added to the "addressable-resolver" role. rules: diff --git a/rpms.lock.yaml b/rpms.lock.yaml new file mode 100644 index 00000000000..a0c7fec817c --- /dev/null +++ b/rpms.lock.yaml @@ -0,0 +1,77 @@ +# url=""; curl $url -o my-rpm.rpm; stat my-rpm.rpm; sha256sum my-rpm.rpm; + +lockfileVersion: 1 +lockfileVendor: redhat +arches: + - arch: x86_64 + packages: + - repoid: ubi-8-appstream-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/appstream/os/Packages/s/socat-1.7.4.1-1.el8.x86_64.rpm" + size: 330744 + checksum: "sha256:b03b86ac05bd5871f14e00400a6ddd30d8e9ed97b93e56e96789706c36e2f379" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/t/tar-1.30-9.el8.x86_64.rpm" + size: 858812 + checksum: "sha256:6b0dc7341d743c89fa038292a7e04761ebb6cc98208ebc26dee9f01e2c1a9529" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/r/rsync-3.1.3-19.el8_7.1.x86_64.rpm" + size: 420156 + checksum: "sha256:7aef9de61fbf590995b07d92f99a3f3478d6c0543d7a6e1ebb6f4b1c02334283" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/t/tzdata-2024b-4.el8.noarch.rpm" + size: 486864 + checksum: "sha256:b629ec4b416d8127314c8aecce5ada2c0c102f5dbdeb48f9a3739cbcdf2ee500" + - arch: aarch64 + packages: + - repoid: ubi-8-appstream-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/appstream/os/Packages/s/socat-1.7.4.1-1.el8.aarch64.rpm" + size: 324364 + checksum: "sha256:eb27326c2f3f7c813f0f21e15177ab3f4c74778e2ef8029de51aafb09445c515" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/t/tar-1.30-9.el8.aarch64.rpm" + size: 849892 + checksum: "sha256:3ba95ecab30f49ecf168ee37e6bc332b626bde62ef7bf61801613f93e2126d8e" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/r/rsync-3.1.3-19.el8_7.1.aarch64.rpm" + size: 410088 + checksum: "sha256:d700d21063ae2b609031a3a8772012aff012899062e952ca43370c495f7e40ff" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/t/tzdata-2024b-4.el8.noarch.rpm" + size: 486864 + checksum: "sha256:b629ec4b416d8127314c8aecce5ada2c0c102f5dbdeb48f9a3739cbcdf2ee500" + - arch: s390x + packages: + - repoid: ubi-8-appstream-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/appstream/os/Packages/s/socat-1.7.4.1-1.el8.s390x.rpm" + size: 320544 + checksum: "sha256:4e8380ed4b4570663136b8b499bfe343b688bda676028ef5172d2155ac80e6ae" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/t/tar-1.30-9.el8.s390x.rpm" + size: 853548 + checksum: "sha256:1efadfc1d2113503b8b0e95939c4cb98a7e0095fb383dec2ac4bf652822a8d87" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/r/rsync-3.1.3-19.el8_7.1.s390x.rpm" + size: 413364 + checksum: "sha256:8819079e4ea1236eab315348584007918798776c6ea23dae5725544148316cfb" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/t/tzdata-2024b-4.el8.noarch.rpm" + size: 486864 + checksum: "sha256:b629ec4b416d8127314c8aecce5ada2c0c102f5dbdeb48f9a3739cbcdf2ee500" + - arch: ppc64le + packages: + - repoid: ubi-8-appstream-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/appstream/os/Packages/s/socat-1.7.4.1-1.el8.ppc64le.rpm" + size: 337076 + checksum: "sha256:51f267ce6469e7967815e1f202b8afa84010717ff24fbff30c7c1bc9ee15d1d1" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/t/tar-1.30-9.el8.ppc64le.rpm" + size: 878620 + checksum: "sha256:c34619440c83b785306420d9ae4a21ccbafe09815e5631510cccb6433f435a47" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/r/rsync-3.1.3-19.el8_7.1.ppc64le.rpm" + size: 442696 + checksum: "sha256:698ca98abf03ab4dcc3d4d1795f4a392d33a2e84f0b1b1f4b9856b38e8ef0b77" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/t/tzdata-2024b-4.el8.noarch.rpm" + size: 486864 + checksum: "sha256:b629ec4b416d8127314c8aecce5ada2c0c102f5dbdeb48f9a3739cbcdf2ee500" diff --git a/vendor/knative.dev/pkg/controller/stats_reporter.go b/vendor/knative.dev/pkg/controller/stats_reporter.go index 99386f91b29..1488a634ebc 100644 --- a/vendor/knative.dev/pkg/controller/stats_reporter.go +++ b/vendor/knative.dev/pkg/controller/stats_reporter.go @@ -198,7 +198,7 @@ func (r *reporter) ReportReconcile(duration time.Duration, success string, key t return err } - metrics.RecordBatch(ctx, reconcileCountStat.M(1), - reconcileLatencyStat.M(duration.Milliseconds())) + // TODO skonto: fix latency histogram + metrics.RecordBatch(ctx, reconcileCountStat.M(1)) return nil } diff --git a/vendor/knative.dev/pkg/webhook/stats_reporter.go b/vendor/knative.dev/pkg/webhook/stats_reporter.go index bc62820b987..38e357016a0 100644 --- a/vendor/knative.dev/pkg/webhook/stats_reporter.go +++ b/vendor/knative.dev/pkg/webhook/stats_reporter.go @@ -194,9 +194,8 @@ func (r *reporter) ReportAdmissionRequest(req *admissionv1.AdmissionRequest, res return err } - metrics.RecordBatch(ctx, requestCountM.M(1), - // Convert time.Duration in nanoseconds to milliseconds - responseTimeInMsecM.M(float64(d.Milliseconds()))) + // TODO skonto: fix latency histogram + metrics.Record(ctx, requestCountM.M(1)) return nil }