From cb011b69725899a9c7badfcb84619c97f341ff3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 13:59:45 +0000 Subject: [PATCH 1/2] [release-v1.19][gomod]: Bump go.uber.org/zap from 1.27.0 to 1.27.1 Bumps [go.uber.org/zap](https://github.com/uber-go/zap) from 1.27.0 to 1.27.1. - [Release notes](https://github.com/uber-go/zap/releases) - [Changelog](https://github.com/uber-go/zap/blob/master/CHANGELOG.md) - [Commits](https://github.com/uber-go/zap/compare/v1.27.0...v1.27.1) --- updated-dependencies: - dependency-name: go.uber.org/zap dependency-version: 1.27.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3bffcec9b..e682c6378 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/oapi-codegen/nethttp-middleware v1.0.2 github.com/oapi-codegen/oapi-codegen/v2 v2.4.1 github.com/oapi-codegen/runtime v1.1.2 - go.uber.org/zap v1.27.0 + go.uber.org/zap v1.27.1 k8s.io/api v0.33.5 k8s.io/apiextensions-apiserver v0.33.5 k8s.io/apimachinery v0.33.5 diff --git a/go.sum b/go.sum index 2ab679dfb..7abdc4125 100644 --- a/go.sum +++ b/go.sum @@ -605,8 +605,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= From fb982067893b5a283ac16ecb645254802f782a30 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 14:01:25 +0000 Subject: [PATCH 2/2] Run make generate-release --- openshift/ci-operator/build-image/Dockerfile | 8 ++++---- .../ci-operator/knative-images/eventmesh/Dockerfile | 13 ++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/openshift/ci-operator/build-image/Dockerfile b/openshift/ci-operator/build-image/Dockerfile index 4ad257e54..a566455e4 100755 --- a/openshift/ci-operator/build-image/Dockerfile +++ b/openshift/ci-operator/build-image/Dockerfile @@ -1,17 +1,17 @@ # DO NOT EDIT! Generated Dockerfile. -FROM registry.ci.openshift.org/ocp/4.17:cli-artifacts as tools +FROM registry.ci.openshift.org/ocp/4.19:cli-artifacts as tools # Dockerfile to bootstrap build and test in openshift-ci -FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.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 diff --git a/openshift/ci-operator/knative-images/eventmesh/Dockerfile b/openshift/ci-operator/knative-images/eventmesh/Dockerfile index bdc015bfb..d07131bd9 100755 --- a/openshift/ci-operator/knative-images/eventmesh/Dockerfile +++ b/openshift/ci-operator/knative-images/eventmesh/Dockerfile @@ -1,6 +1,6 @@ # DO NOT EDIT! Generated Dockerfile for backends/cmd/eventmesh. -ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.24-openshift-4.20 -ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal +ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20 +ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal FROM $GO_BUILDER as builder @@ -23,14 +23,17 @@ COPY LICENSE /licenses/ USER 65532 LABEL \ - com.redhat.component="openshift-serverless-1-backstage-plugins-eventmesh-rhel8-container" \ - name="openshift-serverless-1/backstage-plugins-eventmesh-rhel8" \ + com.redhat.component="openshift-serverless-1-kn-backstage-plugins-eventmesh-rhel9-container" \ + name="openshift-serverless-1/kn-backstage-plugins-eventmesh-rhel9" \ version=$VERSION \ summary="Red Hat OpenShift Serverless 1 Backstage Plugins Eventmesh" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Backstage Plugins Eventmesh" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Backstage Plugins Eventmesh" \ io.k8s.description="Red Hat OpenShift Serverless Backstage Plugins Eventmesh" \ - io.openshift.tags="eventmesh" + io.openshift.tags="eventmesh" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.39::el9" ENTRYPOINT ["/usr/bin/eventmesh"]