diff --git a/build/go.mod b/build/go.mod index 91e3748c0..5c4353333 100644 --- a/build/go.mod +++ b/build/go.mod @@ -4,7 +4,7 @@ go 1.22.0 require ( knative.dev/kn-plugin-event v0.0.0 - knative.dev/toolbox/magetasks v0.0.0-20240412084849-703489d35306 + knative.dev/toolbox/magetasks v0.0.0-20251014134735-7842b8f3eb72 ) require ( diff --git a/build/go.sum b/build/go.sum index 1580febbe..514b63aef 100644 --- a/build/go.sum +++ b/build/go.sum @@ -804,6 +804,8 @@ knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad h1:Nrjtr2H168rJeamH4QdyLMV1lE knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad/go.mod h1:StJI72GWcm/iErmk4RqFJiOo8RLbVqPbHxUqeVwAzeo= knative.dev/toolbox/magetasks v0.0.0-20240412084849-703489d35306 h1:mG2rEGCg4vZAs+D2rIzISuqmND8HNkcNCYvRmEXvG8s= knative.dev/toolbox/magetasks v0.0.0-20240412084849-703489d35306/go.mod h1:+LHHOXHlXXXiD8WG0ke72XTt/SSpSqUUX1dG8h9AGIE= +knative.dev/toolbox/magetasks v0.0.0-20251014134735-7842b8f3eb72 h1:QC5VT1rTiK2NxXaE/sv//Da7WhvRDHllk/VywCND7EQ= +knative.dev/toolbox/magetasks v0.0.0-20251014134735-7842b8f3eb72/go.mod h1:1nfGcDoGtuIR4nOOgg5SwQq9Sdxy/XuM971sowS4X90= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/openshift/ci-operator/build-image/Dockerfile b/openshift/ci-operator/build-image/Dockerfile new file mode 100755 index 000000000..c141d4fb9 --- /dev/null +++ b/openshift/ci-operator/build-image/Dockerfile @@ -0,0 +1,26 @@ +# DO NOT EDIT! Generated Dockerfile. + +FROM registry.ci.openshift.org/ocp/4.17: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.22-openshift-4.17 as builder + +ARG TARGETARCH + +COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel8 /usr/bin/oc + +RUN ln -s /usr/bin/oc /usr/bin/kubectl + +RUN yum install -y httpd-tools + +RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && \ + chmod 700 ./get-helm-3 + +RUN ./get-helm-3 --version v3.11.3 --no-sudo && helm version + +RUN GOFLAGS='' go install github.com/mikefarah/yq/v3@latest +RUN GOFLAGS='' go install -tags="exclude_graphdriver_btrfs containers_image_openpgp" github.com/containers/skopeo/cmd/skopeo@v1.17.0 + +# go install creates $GOPATH/.cache with root permissions, we delete it here +# to avoid permission issues with the runtime users +RUN rm -rf $GOPATH/.cache diff --git a/openshift/ci-operator/images/kn-event-sender/Dockerfile b/openshift/ci-operator/images/kn-event-sender/Dockerfile new file mode 100755 index 000000000..5834248e7 --- /dev/null +++ b/openshift/ci-operator/images/kn-event-sender/Dockerfile @@ -0,0 +1,40 @@ +# DO NOT EDIT! Generated Dockerfile for cmd/kn-event-sender. +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 + +WORKDIR /workspace +COPY . . + +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime +ENV GOFLAGS='-mod=mod' +ENV GOFLAGS='' + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/kn-event-sender + +FROM $GO_RUNTIME + +ARG VERSION=knative-v1.16 + +COPY --from=builder /usr/bin/main /usr/bin/kn-event-sender +COPY LICENSE /licenses/ + +USER 65532 + +LABEL \ + com.redhat.component="openshift-serverless-1-kn-plugin-event-sender-rhel8-container" \ + name="openshift-serverless-1/kn-plugin-event-sender-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Kn Plugin Event Kn Event Sender" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Kn Plugin Event Kn Event Sender" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Kn Plugin Event Kn Event Sender" \ + io.k8s.description="Red Hat OpenShift Serverless Kn Plugin Event Kn Event Sender" \ + io.openshift.tags="kn-event-sender" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + +ENTRYPOINT ["/usr/bin/kn-event-sender"] diff --git a/openshift/ci-operator/images/kn-event/Dockerfile b/openshift/ci-operator/images/kn-event/Dockerfile new file mode 100755 index 000000000..2319aac64 --- /dev/null +++ b/openshift/ci-operator/images/kn-event/Dockerfile @@ -0,0 +1,40 @@ +# DO NOT EDIT! Generated Dockerfile for cmd/kn-event. +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 + +WORKDIR /workspace +COPY . . + +ENV CGO_ENABLED=1 +ENV GOEXPERIMENT=strictfipsruntime +ENV GOFLAGS='-mod=mod' +ENV GOFLAGS='' + +RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/kn-event + +FROM $GO_RUNTIME + +ARG VERSION=knative-v1.16 + +COPY --from=builder /usr/bin/main /usr/bin/kn-event +COPY LICENSE /licenses/ + +USER 65532 + +LABEL \ + com.redhat.component="openshift-serverless-1-kn-plugin-event-kn-event-rhel8-container" \ + name="openshift-serverless-1/kn-plugin-event-kn-event-rhel8" \ + version=$VERSION \ + summary="Red Hat OpenShift Serverless 1 Kn Plugin Event Kn Event" \ + maintainer="serverless-support@redhat.com" \ + description="Red Hat OpenShift Serverless 1 Kn Plugin Event Kn Event" \ + io.k8s.display-name="Red Hat OpenShift Serverless 1 Kn Plugin Event Kn Event" \ + io.k8s.description="Red Hat OpenShift Serverless Kn Plugin Event Kn Event" \ + io.openshift.tags="kn-event" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + +ENTRYPOINT ["/usr/bin/kn-event"] diff --git a/openshift/ci-operator/source-image/Dockerfile b/openshift/ci-operator/source-image/Dockerfile new file mode 100755 index 000000000..0bc58d0cd --- /dev/null +++ b/openshift/ci-operator/source-image/Dockerfile @@ -0,0 +1,7 @@ +# DO NOT EDIT! Generated Dockerfile. + +FROM src + +RUN chmod +x vendor/k8s.io/code-generator/generate-groups.sh || true +RUN chmod +x vendor/knative.dev/pkg/hack/generate-knative.sh || true +RUN chmod +x vendor/k8s.io/code-generator/generate-internal-groups.sh || true diff --git a/openshift/images.yaml b/openshift/images.yaml new file mode 100755 index 000000000..a07bc3ee1 --- /dev/null +++ b/openshift/images.yaml @@ -0,0 +1,30 @@ +knative.dev/eventing/cmd/apiserver_receive_adapter: registry.ci.openshift.org/openshift/knative-eventing-apiserver-receive-adapter:knative-v1.16 +knative.dev/eventing/cmd/appender: registry.ci.openshift.org/openshift/knative-eventing-appender:knative-v1.16 +knative.dev/eventing/cmd/broker/filter: registry.ci.openshift.org/openshift/knative-eventing-filter:knative-v1.16 +knative.dev/eventing/cmd/broker/ingress: registry.ci.openshift.org/openshift/knative-eventing-ingress:knative-v1.16 +knative.dev/eventing/cmd/controller: registry.ci.openshift.org/openshift/knative-eventing-controller:knative-v1.16 +knative.dev/eventing/cmd/event_display: registry.ci.openshift.org/openshift/knative-eventing-event-display:knative-v1.16 +knative.dev/eventing/cmd/heartbeats: registry.ci.openshift.org/openshift/knative-eventing-heartbeats:knative-v1.16 +knative.dev/eventing/cmd/heartbeats_receiver: registry.ci.openshift.org/openshift/knative-eventing-heartbeats-receiver:knative-v1.16 +knative.dev/eventing/cmd/in_memory/channel_controller: registry.ci.openshift.org/openshift/knative-eventing-channel-controller:knative-v1.16 +knative.dev/eventing/cmd/in_memory/channel_dispatcher: registry.ci.openshift.org/openshift/knative-eventing-channel-dispatcher:knative-v1.16 +knative.dev/eventing/cmd/jobsink: registry.ci.openshift.org/openshift/knative-eventing-jobsink:knative-v1.16 +knative.dev/eventing/cmd/mqttsource: registry.ci.openshift.org/openshift/knative-eventing-mqttsource:knative-v1.16 +knative.dev/eventing/cmd/mtchannel_broker: registry.ci.openshift.org/openshift/knative-eventing-mtchannel-broker:knative-v1.16 +knative.dev/eventing/cmd/mtping: registry.ci.openshift.org/openshift/knative-eventing-mtping:knative-v1.16 +knative.dev/eventing/cmd/pong: registry.ci.openshift.org/openshift/knative-eventing-pong:knative-v1.16 +knative.dev/eventing/cmd/schema: registry.ci.openshift.org/openshift/knative-eventing-schema:knative-v1.16 +knative.dev/eventing/cmd/webhook: registry.ci.openshift.org/openshift/knative-eventing-webhook:knative-v1.16 +knative.dev/eventing/cmd/websocketsource: registry.ci.openshift.org/openshift/knative-eventing-websocketsource:knative-v1.16 +knative.dev/eventing/test/test_images/event-sender: registry.ci.openshift.org/openshift/knative-eventing-test-event-sender:knative-v1.16 +knative.dev/eventing/test/test_images/print: registry.ci.openshift.org/openshift/knative-eventing-test-print:knative-v1.16 +knative.dev/eventing/test/test_images/recordevents: registry.ci.openshift.org/openshift/knative-eventing-test-recordevents:knative-v1.16 +knative.dev/eventing/test/test_images/request-sender: registry.ci.openshift.org/openshift/knative-eventing-test-request-sender:knative-v1.16 +knative.dev/eventing/test/test_images/wathola-fetcher: registry.ci.openshift.org/openshift/knative-eventing-test-wathola-fetcher:knative-v1.16 +knative.dev/eventing/test/test_images/wathola-forwarder: registry.ci.openshift.org/openshift/knative-eventing-test-wathola-forwarder:knative-v1.16 +knative.dev/eventing/test/test_images/wathola-receiver: registry.ci.openshift.org/openshift/knative-eventing-test-wathola-receiver:knative-v1.16 +knative.dev/eventing/test/test_images/wathola-sender: registry.ci.openshift.org/openshift/knative-eventing-test-wathola-sender:knative-v1.16 +knative.dev/kn-plugin-event/cmd/kn-event: registry.ci.openshift.org/openshift/kn-plugin-event-kn-event:knative-v1.16 +knative.dev/kn-plugin-event/cmd/kn-event-sender: registry.ci.openshift.org/openshift/kn-plugin-event-kn-event-sender:knative-v1.16 +knative.dev/pkg/apiextensions/storageversion/cmd/migrate: registry.ci.openshift.org/openshift/knative-eventing-migrate:knative-v1.16 +knative.dev/reconciler-test/cmd/eventshub: registry.ci.openshift.org/openshift/knative-eventing-test-eventshub:knative-v1.16