[release-v1.15] Use signed artifacts in cli image (knative#538)

dsimansk · Nov 28, 2024 · f5b5ad7 · f5b5ad7
1 parent 9e75c93
commit f5b5ad7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/.tekton/kn-client-cli-artifacts-115-pull-request.yaml b/.tekton/kn-client-cli-artifacts-115-pull-request.yaml
@@ -26,6 +26,7 @@ spec:
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
+        - CLI_ARTIFACTS=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-kn-cli-artifacts-rhel8:1.15.0
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic

diff --git a/.tekton/kn-client-cli-artifacts-115-push.yaml b/.tekton/kn-client-cli-artifacts-115-push.yaml
@@ -25,6 +25,7 @@ spec:
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
+        - CLI_ARTIFACTS=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-kn-cli-artifacts-rhel8:1.15.0
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic

diff --git a/openshift/ci-operator/knative-images/cli-artifacts/Dockerfile b/openshift/ci-operator/knative-images/cli-artifacts/Dockerfile
@@ -1,10 +1,16 @@
 # This is not generated Dockerfile, yet!
+ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
 ARG CLI_ARTIFACTS=registry.redhat.io/openshift-serverless-1/kn-cli-artifacts-rhel8:1.14
 
-FROM $CLI_ARTIFACTS
+FROM $CLI_ARTIFACTS as builder
+
+FROM $GO_RUNTIME
 
 ARG VERSION=knative-v1.15
 
+RUN mkdir -p /usr/share/kn
+
+COPY --from=builder /usr/share/kn /usr/share/kn
 COPY LICENSE /licenses/
 
 USER 65532