Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-deps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: ${{ github.head_ref }}
path: ./src/github.com/${{ github.repository }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ metadata:
name: kn-eventing-istio-controller-115
spec:
componentName: kn-eventing-istio-controller-115
application: serverless-operator-135

application: serverless-operator-135
source:
git:
url: https://github.com/openshift-knative/eventing-istio.git
Expand Down
103 changes: 38 additions & 65 deletions .tekton/docker-build.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
apiVersion: tekton.dev/v1
kind: Pipeline
metadata:
creationTimestamp:
labels:
pipelines.openshift.io/runtime: generic
pipelines.openshift.io/strategy: docker
Expand All @@ -13,27 +12,14 @@ 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:e119aa864b094715cb8dd01d44d2752658f1a1b83a3417e92456f26a06a3c1d8
- name: kind
value: task
resolver: bundles
params:
- default:
- linux/x86_64
- linux/arm64
- linux/ppc64le
- linux/s390x
description: List of platforms to build the container images on. The available set of values is determined by the configuration of the multi-platform-controller.
description: List of platforms to build the container images on. The available
set of values is determined by the configuration of the multi-platform-controller.
name: build-platforms
type: array
- default: --all-projects --org=3e1a4cca-ebfb-495f-b64c-3cc960d566b4 --exclude=test*,vendor,third_party
Expand All @@ -45,7 +31,8 @@ spec:
name: build-source-image
type: string
- default: "false"
description: 'Enable in-development package managers. WARNING: the behavior may change at any time without notice. Use at your own risk.'
description: 'Enable in-development package managers. WARNING: the behavior may
change at any time without notice. Use at your own risk.'
name: prefetch-input-dev-package-managers
- default: []
description: Additional image tags
Expand All @@ -62,17 +49,15 @@ spec:
name: output-image
type: string
- default: .
description: Path to the source code of an application's component from where to build image.
description: Path to the source code of an application's component from where
to build image.
name: path-context
type: string
- default: Dockerfile
description: Path to the Dockerfile inside the context specified by parameter path-context
description: Path to the Dockerfile inside the context specified by parameter
path-context
name: dockerfile
type: string
- default: "false"
description: Force rebuild image
name: rebuild
type: string
- default: "false"
description: Skip checks against built image
name: skip-checks
Expand All @@ -82,17 +67,26 @@ 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: ""
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
description: Image tag expiration time, time values could be something like 1h,
2d, 3w for hours, days, and weeks, respectively.
name: image-expires-after
type: string
- default: "true"
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: "false"
description: Enable cache proxy configuration
name: enable-cache-proxy
- default: []
description: Array of --build-arg values ("arg=value" strings) for buildah
name: build-args
Expand All @@ -102,13 +96,10 @@ spec:
name: build-args-file
type: string
- default: "false"
description: Whether to enable privileged mode, should be used only with remote VMs
description: Whether to enable privileged mode, should be used only with remote
VMs
name: privileged-nested
type: string
- name: enable-cache-proxy
default: 'false'
description: Enable cache proxy configuration
type: string
results:
- description: ""
name: IMAGE_URL
Expand Down Expand Up @@ -200,12 +191,6 @@ spec:
resolver: bundles
- name: init
params:
- name: image-url
value: $(params.output-image)
- name: rebuild
value: $(params.rebuild)
- name: skip-checks
value: $(params.skip-checks)
- name: enable-cache-proxy
value: $(params.enable-cache-proxy)
taskRef:
Expand Down Expand Up @@ -238,11 +223,6 @@ spec:
- name: kind
value: task
resolver: bundles
when:
- input: $(tasks.init.results.build)
operator: in
values:
- "true"
workspaces:
- name: basic-auth
workspace: git-auth
Expand Down Expand Up @@ -274,16 +254,20 @@ 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: HTTP_PROXY
value: $(tasks.init.results.http-proxy)
- name: NO_PROXY
value: $(tasks.init.results.no-proxy)
- name: SOURCE_ARTIFACT
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
- name: CACHI2_ARTIFACT
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
- name: IMAGE_APPEND_PLATFORM
value: "true"
- name: HTTP_PROXY
value: $(tasks.init.results.http-proxy)
- name: NO_PROXY
value: $(tasks.init.results.no-proxy)
runAfter:
- prefetch-dependencies
taskRef:
Expand All @@ -295,24 +279,17 @@ spec:
- name: kind
value: task
resolver: bundles
when:
- input: $(tasks.init.results.build)
operator: in
values:
- "true"
- name: build-image-index
params:
- name: IMAGE
value: $(params.output-image)
- name: COMMIT_SHA
value: $(tasks.clone-repository.results.commit)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
- name: ALWAYS_BUILD_INDEX
value: $(params.build-image-index)
- name: IMAGES
value:
- $(tasks.build-images.results.IMAGE_REF[*])
- name: BUILDAH_FORMAT
value: $(params.buildah-format)
runAfter:
- build-images
taskRef:
Expand All @@ -324,11 +301,6 @@ spec:
- name: kind
value: task
resolver: bundles
when:
- input: $(tasks.init.results.build)
operator: in
values:
- "true"
- name: build-source-image
params:
- name: BINARY_IMAGE
Expand All @@ -351,10 +323,6 @@ spec:
value: task
resolver: bundles
when:
- input: $(tasks.init.results.build)
operator: in
values:
- "true"
- input: $(params.build-source-image)
operator: in
values:
Expand Down Expand Up @@ -408,7 +376,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)
Expand Down Expand Up @@ -543,7 +516,7 @@ spec:
- name: name
value: rpms-signature-scan
- name: bundle
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:e127e0e0a5aab1364b560436594fe7ed67abcd5f8d6dd3ef14ac1f35cf81078c
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:7f2e8ed5c2d8b2433cc9a7779ce7c617de7eb0dc8f16d07d2a792cee816ed503
- name: kind
value: task
resolver: bundles
Expand Down
2 changes: 1 addition & 1 deletion .tekton/kn-eventing-istio-controller-115-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
value: openshift/ci-operator/knative-images/controller/Dockerfile
- name: build-args
value:
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
- 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
Expand Down
2 changes: 1 addition & 1 deletion .tekton/kn-eventing-istio-controller-115-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
value: openshift/ci-operator/knative-images/controller/Dockerfile
- name: build-args
value:
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
- 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
Expand Down
2 changes: 1 addition & 1 deletion openshift/ci-operator/build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
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
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.25-openshift-4.21 as builder

ARG TARGETARCH

Expand Down
13 changes: 8 additions & 5 deletions openshift/ci-operator/knative-images/controller/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DO NOT EDIT! Generated Dockerfile for cmd/controller.
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.25-openshift-4.21
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal

FROM $GO_BUILDER as builder
Expand All @@ -22,14 +22,17 @@ COPY LICENSE /licenses/
USER 65532

LABEL \
com.redhat.component="openshift-serverless-1-eventing-istio-controller-rhel8-container" \
name="openshift-serverless-1/eventing-istio-controller-rhel8" \
com.redhat.component="openshift-serverless-1-kn-eventing-istio-controller-rhel8-container" \
name="openshift-serverless-1/kn-eventing-istio-controller-rhel8" \
version=$VERSION \
summary="Red Hat OpenShift Serverless 1 Eventing Istio Controller" \
maintainer="serverless-support@redhat.com" \
description="Red Hat OpenShift Serverless 1 Eventing Istio Controller" \
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Istio Controller" \
io.k8s.description="Red Hat OpenShift Serverless Eventing Istio Controller" \
io.openshift.tags="controller"

io.openshift.tags="controller" \
vendor="Red Hat, Inc." \
release=$VERSION \
cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"

ENTRYPOINT ["/usr/bin/controller"]