From 5c1d7d7344f54dabc5de0d8a903d5adc050e1f26 Mon Sep 17 00:00:00 2001 From: serverless-qe Date: Wed, 29 Oct 2025 08:49:22 +0000 Subject: [PATCH 1/2] Generate dockerfiles with "make generate-release" --- openshift/ci-operator/knative-images/controller/Dockerfile | 7 +++++-- openshift/ci-operator/knative-images/webhook/Dockerfile | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/openshift/ci-operator/knative-images/controller/Dockerfile b/openshift/ci-operator/knative-images/controller/Dockerfile index f4a5ec61a6..32966cee59 100755 --- a/openshift/ci-operator/knative-images/controller/Dockerfile +++ b/openshift/ci-operator/knative-images/controller/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Net Istio Controller" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Net Istio Controller" \ io.k8s.description="Red Hat OpenShift Serverless Net Istio Controller" \ - io.openshift.tags="controller" - + io.openshift.tags="controller" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/controller"] diff --git a/openshift/ci-operator/knative-images/webhook/Dockerfile b/openshift/ci-operator/knative-images/webhook/Dockerfile index 1d3581192d..44d131411e 100755 --- a/openshift/ci-operator/knative-images/webhook/Dockerfile +++ b/openshift/ci-operator/knative-images/webhook/Dockerfile @@ -30,6 +30,9 @@ LABEL \ description="Red Hat OpenShift Serverless 1 Net Istio Webhook" \ io.k8s.display-name="Red Hat OpenShift Serverless 1 Net Istio Webhook" \ io.k8s.description="Red Hat OpenShift Serverless Net Istio Webhook" \ - io.openshift.tags="webhook" - + io.openshift.tags="webhook" \ + vendor="Red Hat, Inc." \ + release=$VERSION \ + cpe="cpe:/a:redhat:openshift_serverless:1.36::el8" + ENTRYPOINT ["/ko-app/webhook"] From 81f1f642e5702f4af33479a228b26d79674e8a2e Mon Sep 17 00:00:00 2001 From: serverless-qe Date: Wed, 29 Oct 2025 08:49:23 +0000 Subject: [PATCH 2/2] [release-v1.16] Sync Konflux configurations --- .tekton/docker-build.yaml | 41 +++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/.tekton/docker-build.yaml b/.tekton/docker-build.yaml index 53784607d5..6ae0019e5b 100755 --- a/.tekton/docker-build.yaml +++ b/.tekton/docker-build.yaml @@ -13,20 +13,6 @@ spec: _Uses `buildah` to create a multi-platform container image leveraging [trusted artifacts](https://konflux-ci.dev/architecture/ADR/0036-trusted-artifacts.html). It also optionally creates a source image and runs some build-time tests. This pipeline requires that the [multi platform controller](https://github.com/konflux-ci/multi-platform-controller) is deployed and configured on your Konflux instance. Information is shared between tasks using OCI artifacts instead of PVCs. EC will pass the [`trusted_task.trusted`](https://conforma.dev/docs/policy/packages/release_trusted_task.html#trusted_task__trusted) policy as long as all data used to build the artifact is generated from trusted tasks. This pipeline is pushed as a Tekton bundle to [quay.io](https://quay.io/repository/konflux-ci/tekton-catalog/pipeline-docker-build-multi-platform-oci-ta?tab=tags)_ - finally: - - name: show-sbom - params: - - name: IMAGE_URL - value: $(tasks.build-image-index.results.IMAGE_URL) - taskRef: - params: - - name: name - value: show-sbom - - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:beb0616db051952b4b861dd8c3e00fa1c0eccbd926feddf71194d3bb3ace9ce7 - - name: kind - value: task - resolver: bundles params: - default: - linux/x86_64 @@ -86,7 +72,7 @@ spec: name: hermetic type: string - default: "" - description: Build dependencies to be prefetched by Cachi2 + description: Build dependencies to be prefetched name: prefetch-input type: string - default: "" @@ -98,6 +84,11 @@ spec: description: Add built image into an OCI image index name: build-image-index type: string + - default: docker + description: The format for the resulting image's mediaType. Valid values are + oci or docker. + name: buildah-format + type: string - default: [] description: Array of --build-arg values ("arg=value" strings) for buildah name: build-args @@ -274,6 +265,10 @@ spec: value: $(params.build-args-file) - name: PRIVILEGED_NESTED value: $(params.privileged-nested) + - name: SOURCE_URL + value: $(tasks.clone-repository.results.url) + - name: BUILDAH_FORMAT + value: $(params.buildah-format) - name: SOURCE_ARTIFACT value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT) - name: CACHI2_ARTIFACT @@ -309,6 +304,8 @@ spec: - name: IMAGES value: - $(tasks.build-images.results.IMAGE_REF[*]) + - name: BUILDAH_FORMAT + value: $(params.buildah-format) runAfter: - build-images taskRef: @@ -377,7 +374,12 @@ spec: operator: in values: - "false" - - name: clair-scan + - matrix: + params: + - name: image-platform + value: + - $(params.build-platforms) + name: clair-scan params: - name: image-digest value: $(tasks.build-image-index.results.IMAGE_DIGEST) @@ -399,7 +401,12 @@ spec: operator: in values: - "false" - - name: ecosystem-cert-preflight-checks + - matrix: + params: + - name: platform + value: + - $(params.build-platforms) + name: ecosystem-cert-preflight-checks params: - name: image-url value: $(tasks.build-image-index.results.IMAGE_URL)