[release-v1.15] Update depending image refs (#525)

* [release-v1.15] Update depending image refs * Use konflux image for artifacts
openshift-knative · Nov 19, 2024 · 67bde28 · 67bde28
1 parent 6ec062a
commit 67bde28
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 28 deletions.
diff --git a/openshift/ci-operator/knative-images/cli-artifacts/Dockerfile b/openshift/ci-operator/knative-images/cli-artifacts/Dockerfile
@@ -1,33 +1,7 @@
 # This is not generated Dockerfile, yet!
-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
+ARG CLI_ARTIFACTS=quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-client-cli-artifacts:latest
 
-FROM $GO_BUILDER as builder
-
-WORKDIR /go/src/github.com/knative/client
-COPY . .
-
-ENV CGO_ENABLED=1
-ENV GOEXPERIMENT=strictfipsruntime
-# Pass to cross compile target
-ENV GOFLAGS="-tags=strictfipsruntime"
-
-RUN make build-cross &&  \
-    bash package_cliartifacts.sh
-
-ARG VERSION=knative-v1.15
-FROM $GO_RUNTIME
-
-RUN mkdir -p /usr/share/kn/{linux_amd64,linux_arm64,linux_ppc64le,linux_s390x,macos_amd64,macos_arm64,windows}
-
-COPY --from=builder /go/src/github.com/knative/client/kn-linux-amd64.tar.gz /usr/share/kn/linux_amd64/
-COPY --from=builder /go/src/github.com/knative/client/kn-linux-arm64.tar.gz /usr/share/kn/linux_arm64/
-COPY --from=builder /go/src/github.com/knative/client/kn-linux-ppc64le.tar.gz /usr/share/kn/linux_ppc64le/
-COPY --from=builder /go/src/github.com/knative/client/kn-linux-s390x.tar.gz /usr/share/kn/linux_s390x/
-COPY --from=builder /go/src/github.com/knative/client/kn-macos-amd64.tar.gz /usr/share/kn/macos_amd64/
-COPY --from=builder /go/src/github.com/knative/client/kn-macos-arm64.tar.gz /usr/share/kn/macos_arm64/
-COPY --from=builder /go/src/github.com/knative/client/kn-windows-amd64.zip  /usr/share/kn/windows/
-COPY --from=builder /go/src/github.com/knative/client/LICENSE  /usr/share/kn/LICENSE
+FROM $CLI_ARTIFACTS
 
 USER 65532
 

diff --git a/openshift/ci-operator/knative-images/kn/Dockerfile b/openshift/ci-operator/knative-images/kn/Dockerfile
@@ -1,6 +1,8 @@
 # DO NOT EDIT! Generated Dockerfile for cmd/kn.
 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
+ARG IMAGE_KN_PLUGIN_FUNC_UTIL=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8sha256:49087b51e8b97d30ff7db67e1983d4ee63665092009af20a2598d7410eb781fb
+ARG IMAGE_KN_PLUGIN_EVENT_SENDER=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:443162d16adcb0dbc5ddbff4de172b2e7e80cc17928e0d9bf0e723cb0e99ebaf
 
 FROM $GO_BUILDER as builder
 
@@ -9,6 +11,8 @@ COPY . .
 
 ENV CGO_ENABLED=1
 ENV GOEXPERIMENT=strictfipsruntime
+ENV KN_PLUGIN_FUNC_UTIL_IMAGE=$IMAGE_KN_PLUGIN_FUNC_UTIL
+ENV KN_PLUGIN_EVENT_SENDER_IMAGE=$IMAGE_KN_PLUGIN_EVENT_SENDER
 
 RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/kn