build kn inside artifact container (#851)

build kn inside artifact container for cross platform
cc @dsimansk

---------

Co-authored-by: David Simansky <[email protected]>

Author: Kaustubh-pande

.tekton/kn-client-cli-artifacts-117-pull-request.yaml

@@ -42,6 +42,10 @@ spec:
         - linux/x86_64
     - name: revision
       value: '{{revision}}'
+    - name: prefetch-input
+      value: '[{"type":"rpm"}]'
+    - name: prefetch-input-dev-package-managers
+      value: 'true'
   taskRunSpecs:
     - pipelineTaskName: sast-shell-check
       stepSpecs:

.tekton/kn-client-cli-artifacts-117-push.yaml

@@ -41,6 +41,10 @@ spec:
         - $(context.pipelineRun.uid)-{{revision}}
         - 1.37.0
         - latest
+    - name: prefetch-input
+      value: '[{"type":"rpm"}]'
+    - name: prefetch-input-dev-package-managers
+      value: 'true'
   taskRunSpecs:
     - pipelineTaskName: sast-shell-check
       stepSpecs:

hack/build.sh

@@ -167,10 +167,10 @@ go_build_with_goos_goarch() {
   echo "🚧 Compile for GOOS=${GOOS} GOARCH=${GOARCH}"
 
   # Env var exported by hack/build-flags.sh
-  GOOS="${GOOS}" GOARCH="${GOARCH}" go build -ldflags "${KN_BUILD_LD_FLAGS:-}" -o kn ./cmd/...
+  GOOS="${GOOS}" GOARCH="${GOARCH}" go build -ldflags "${KN_BUILD_LD_FLAGS:-}" -o "kn-${GOOS}-${GOARCH}" ./cmd/...
 
-  if $(file kn | grep -q -i "Windows"); then
-    mv kn kn.exe
+  if $(file "kn-${GOOS}-${GOARCH}" | grep -q -i "Windows"); then
+    mv "kn-${GOOS}-${GOARCH}" "kn-${GOOS}-${GOARCH}.exe"
   fi
 }
 

openshift/ci-operator/generate-ci-config.sh

@@ -30,7 +30,7 @@ base_images:
   base:
     name: ubi-minimal
     namespace: ocp
-    tag: "8"
+    tag: "9"
 binary_build_commands: |
   TAG=${tag} make install
   TAG=${tag} make build-cross

openshift/ci-operator/knative-images/cli-artifacts/Dockerfile

@@ -1,17 +1,51 @@
-# This is not generated Dockerfile, yet!
+# Not generated yet!
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
 ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
-ARG CLI_ARTIFACTS=registry.redhat.io/openshift-serverless-1/kn-client-cli-artifacts-rhel8:1.36.0
 
-FROM $CLI_ARTIFACTS as builder
+# ---------- BUILD STAGE ----------
+FROM $GO_BUILDER AS builder
+WORKDIR /workspace
+# Allow copying from higher directory when context is limited
+COPY . .
+ENV GO_COMPLIANCE_DEBUG=1
+ENV KN_PLUGIN_FUNC_UTIL_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel9@sha256:a181b639a19b3c36367eec41e5ac0e030bcfcb247b96e6843ff60a9561ead85dn
+ENV KN_PLUGIN_EVENT_SENDER_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel9@sha256:d28cd64bfc1d0978d6f95e8b70d5bf7c36d6b92c0d60460f7ac6fa2b2ba0a15b
+# Build binaries
+# RUN make build-cross-package
+RUN ./hack/build.sh -p linux amd64
+RUN ./hack/build.sh -p linux ppc64le
+RUN ./hack/build.sh -p linux s390x
+RUN ./hack/build.sh -p linux arm64
+RUN ./hack/build.sh -p darwin amd64
+RUN ./hack/build.sh -p darwin arm64
+RUN ./hack/build.sh -p windows amd64
 
-FROM $GO_RUNTIME
+RUN chmod +x kn-linux-amd64 kn-linux-ppc64le kn-linux-s390x kn-windows-amd64.exe kn-darwin-amd64 kn-linux-arm64 kn-darwin-arm64
+
+## ---------- PACKAGING STAGE ----------
+RUN dnf install -y tar zip
 
-ARG VERSION=knative-v1.17
+RUN tar --transform='flags=r;s|kn-linux-amd64|kn|' -zcf kn-linux-amd64.tar.gz kn-linux-amd64 LICENSE \
+  && tar --transform='flags=r;s|kn-linux-ppc64le|kn|' -zcf kn-linux-ppc64le.tar.gz kn-linux-ppc64le LICENSE \
+  && tar --transform='flags=r;s|kn-linux-s390x|kn|' -zcf kn-linux-s390x.tar.gz kn-linux-s390x LICENSE \
+  && tar --transform='flags=r;s|kn-darwin-amd64|kn|' -zcf kn-macos-amd64.tar.gz kn-darwin-amd64 LICENSE \
+  && tar --transform='flags=r;s|kn-linux-arm64|kn|' -zcf kn-linux-arm64.tar.gz kn-linux-arm64 LICENSE \
+  && tar --transform='flags=r;s|kn-darwin-arm64|kn|' -zcf kn-macos-arm64.tar.gz kn-darwin-arm64 LICENSE
 
-RUN mkdir -p /usr/share/kn
+RUN mkdir "windows" && mv kn-windows-amd64.exe ./windows/kn.exe && cp LICENSE ./windows/ && zip --quiet --junk-path - windows/* > kn-windows-amd64.zip
+
+# ---------- FINAL RUNTIME IMAGE ----------
+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 /usr/share/kn /usr/share/kn
-COPY LICENSE /licenses/
+COPY --from=builder /workspace/kn-linux-amd64.tar.gz /usr/share/kn/linux_amd64/
+COPY --from=builder /workspace/kn-linux-ppc64le.tar.gz /usr/share/kn/linux_ppc64le/
+COPY --from=builder /workspace/kn-linux-s390x.tar.gz /usr/share/kn/linux_s390x/
+COPY --from=builder /workspace/kn-macos-amd64.tar.gz /usr/share/kn/macos_amd64/
+COPY --from=builder /workspace/kn-windows-amd64.zip  /usr/share/kn/windows/
+COPY --from=builder /workspace/kn-linux-arm64.tar.gz /usr/share/kn/linux_arm64/
+COPY --from=builder /workspace/kn-linux-arm64.tar.gz /usr/share/kn/macos_arm64/
+COPY --from=builder /workspace/LICENSE /licenses/
 
 USER 65532
 

rpms.in.yaml

@@ -0,0 +1,24 @@
+contentOrigin:
+  # Define at least one source of packages, but you can have as many as you want.
+  repofiles:
+    # Either local path or url pointing to .repo file
+    - 'https://raw.githubusercontent.com/konflux-ci/bazel-builder/refs/heads/bazel8-ubi9/ubi9.repo'
+packages:
+  # list of rpm names to resolve
+  - tar
+  - zip
+
+arches:
+  # The list of architectures can be set in the config file. Any `--arch` option set
+  # on the command line will override this list.
+  - x86_64
+  - aarch64
+  - s390x
+  - ppc64le
+
+context:
+  # Alternative to setting command line options. Usually you will only want
+  # to include one of these options, with the exception of `flatpak` that
+  # can be combined with `image` and `containerfile`
+  # containerfile: ubi9.Containerfile
+  image: registry.access.redhat.com/ubi9/ubi-minimal