Skip to content

Commit df97e91

Browse files
serverless-qeserverless-qe
andauthored
[release-v1.16] Update Konflux configurations (#1698)
* Generate dockerfiles with "make generate-release" * [release-v1.16] Sync Konflux configurations --------- Co-authored-by: serverless-qe <[email protected]>
1 parent eeba2dd commit df97e91

File tree

30 files changed

+222
-131
lines changed

30 files changed

+222
-131
lines changed

.tekton/docker-build.yaml

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,6 @@ spec:
1313
1414
_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.
1515
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)_
16-
finally:
17-
- name: show-sbom
18-
params:
19-
- name: IMAGE_URL
20-
value: $(tasks.build-image-index.results.IMAGE_URL)
21-
taskRef:
22-
params:
23-
- name: name
24-
value: show-sbom
25-
- name: bundle
26-
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:beb0616db051952b4b861dd8c3e00fa1c0eccbd926feddf71194d3bb3ace9ce7
27-
- name: kind
28-
value: task
29-
resolver: bundles
3016
params:
3117
- default:
3218
- linux/x86_64
@@ -86,7 +72,7 @@ spec:
8672
name: hermetic
8773
type: string
8874
- default: ""
89-
description: Build dependencies to be prefetched by Cachi2
75+
description: Build dependencies to be prefetched
9076
name: prefetch-input
9177
type: string
9278
- default: ""
@@ -98,6 +84,11 @@ spec:
9884
description: Add built image into an OCI image index
9985
name: build-image-index
10086
type: string
87+
- default: docker
88+
description: The format for the resulting image's mediaType. Valid values are
89+
oci or docker.
90+
name: buildah-format
91+
type: string
10192
- default: []
10293
description: Array of --build-arg values ("arg=value" strings) for buildah
10394
name: build-args
@@ -274,6 +265,10 @@ spec:
274265
value: $(params.build-args-file)
275266
- name: PRIVILEGED_NESTED
276267
value: $(params.privileged-nested)
268+
- name: SOURCE_URL
269+
value: $(tasks.clone-repository.results.url)
270+
- name: BUILDAH_FORMAT
271+
value: $(params.buildah-format)
277272
- name: SOURCE_ARTIFACT
278273
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
279274
- name: CACHI2_ARTIFACT
@@ -309,6 +304,8 @@ spec:
309304
- name: IMAGES
310305
value:
311306
- $(tasks.build-images.results.IMAGE_REF[*])
307+
- name: BUILDAH_FORMAT
308+
value: $(params.buildah-format)
312309
runAfter:
313310
- build-images
314311
taskRef:
@@ -377,7 +374,12 @@ spec:
377374
operator: in
378375
values:
379376
- "false"
380-
- name: clair-scan
377+
- matrix:
378+
params:
379+
- name: image-platform
380+
value:
381+
- $(params.build-platforms)
382+
name: clair-scan
381383
params:
382384
- name: image-digest
383385
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -399,7 +401,12 @@ spec:
399401
operator: in
400402
values:
401403
- "false"
402-
- name: ecosystem-cert-preflight-checks
404+
- matrix:
405+
params:
406+
- name: platform
407+
value:
408+
- $(params.build-platforms)
409+
name: ecosystem-cert-preflight-checks
403410
params:
404411
- name: image-url
405412
value: $(tasks.build-image-index.results.IMAGE_URL)

openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,17 @@ COPY LICENSE /licenses/
2323
USER 65532
2424

2525
LABEL \
26-
com.redhat.component="openshift-serverless-1-eventing-apiserver-receive-adapter-rhel8-container" \
27-
name="openshift-serverless-1/eventing-apiserver-receive-adapter-rhel8" \
26+
com.redhat.component="openshift-serverless-1-kn-eventing-apiserver-receive-adapter-rhel8-container" \
27+
name="openshift-serverless-1/kn-eventing-apiserver-receive-adapter-rhel8" \
2828
version=$VERSION \
2929
summary="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter" \
3030
maintainer="[email protected]" \
3131
description="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter" \
3232
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter" \
3333
io.k8s.description="Red Hat OpenShift Serverless Eventing Apiserver Receive Adapter" \
34-
io.openshift.tags="apiserver-receive-adapter"
35-
34+
io.openshift.tags="apiserver-receive-adapter" \
35+
vendor="Red Hat, Inc." \
36+
release=$VERSION \
37+
cpe="cpe:/a:redhat:openshift_serverless:1.36::el8"
38+
3639
ENTRYPOINT ["/usr/bin/apiserver_receive_adapter"]

openshift/ci-operator/knative-images/appender/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ LABEL \
3131
description="Red Hat OpenShift Serverless 1 Eventing Appender" \
3232
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Appender" \
3333
io.k8s.description="Red Hat OpenShift Serverless Eventing Appender" \
34-
io.openshift.tags="appender"
35-
34+
io.openshift.tags="appender" \
35+
vendor="Red Hat, Inc." \
36+
release=$VERSION \
37+
cpe="cpe:/a:redhat:openshift_serverless:1.36::el8"
38+
3639
ENTRYPOINT ["/usr/bin/appender"]

openshift/ci-operator/knative-images/channel_controller/Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,17 @@ COPY LICENSE /licenses/
2323
USER 65532
2424

2525
LABEL \
26-
com.redhat.component="openshift-serverless-1-eventing-in-memory-channel-controller-rhel8-container" \
27-
name="openshift-serverless-1/eventing-in-memory-channel-controller-rhel8" \
26+
com.redhat.component="openshift-serverless-1-kn-eventing-in-memory-channel-controller-rhel8-container" \
27+
name="openshift-serverless-1/kn-eventing-in-memory-channel-controller-rhel8" \
2828
version=$VERSION \
2929
summary="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Controller" \
3030
maintainer="[email protected]" \
3131
description="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Controller" \
3232
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Controller" \
3333
io.k8s.description="Red Hat OpenShift Serverless Eventing In Memory Channel Controller" \
34-
io.openshift.tags="in-memory-channel-controller"
35-
34+
io.openshift.tags="in-memory-channel-controller" \
35+
vendor="Red Hat, Inc." \
36+
release=$VERSION \
37+
cpe="cpe:/a:redhat:openshift_serverless:1.36::el8"
38+
3639
ENTRYPOINT ["/usr/bin/channel_controller"]

openshift/ci-operator/knative-images/channel_dispatcher/Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,17 @@ COPY LICENSE /licenses/
2323
USER 65532
2424

2525
LABEL \
26-
com.redhat.component="openshift-serverless-1-eventing-in-memory-channel-dispatcher-rhel8-container" \
27-
name="openshift-serverless-1/eventing-in-memory-channel-dispatcher-rhel8" \
26+
com.redhat.component="openshift-serverless-1-kn-eventing-channel-dispatcher-rhel8-container" \
27+
name="openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8" \
2828
version=$VERSION \
2929
summary="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Dispatcher" \
3030
maintainer="[email protected]" \
3131
description="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Dispatcher" \
3232
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Dispatcher" \
3333
io.k8s.description="Red Hat OpenShift Serverless Eventing In Memory Channel Dispatcher" \
34-
io.openshift.tags="in-memory-channel-dispatcher"
35-
34+
io.openshift.tags="in-memory-channel-dispatcher" \
35+
vendor="Red Hat, Inc." \
36+
release=$VERSION \
37+
cpe="cpe:/a:redhat:openshift_serverless:1.36::el8"
38+
3639
ENTRYPOINT ["/usr/bin/channel_dispatcher"]

openshift/ci-operator/knative-images/controller/Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,17 @@ COPY LICENSE /licenses/
2323
USER 65532
2424

2525
LABEL \
26-
com.redhat.component="openshift-serverless-1-eventing-controller-rhel8-container" \
27-
name="openshift-serverless-1/eventing-controller-rhel8" \
26+
com.redhat.component="openshift-serverless-1-kn-eventing-controller-rhel8-container" \
27+
name="openshift-serverless-1/kn-eventing-controller-rhel8" \
2828
version=$VERSION \
2929
summary="Red Hat OpenShift Serverless 1 Eventing Controller" \
3030
maintainer="[email protected]" \
3131
description="Red Hat OpenShift Serverless 1 Eventing Controller" \
3232
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Controller" \
3333
io.k8s.description="Red Hat OpenShift Serverless Eventing Controller" \
34-
io.openshift.tags="controller"
35-
34+
io.openshift.tags="controller" \
35+
vendor="Red Hat, Inc." \
36+
release=$VERSION \
37+
cpe="cpe:/a:redhat:openshift_serverless:1.36::el8"
38+
3639
ENTRYPOINT ["/usr/bin/controller"]

openshift/ci-operator/knative-images/event_display/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ LABEL \
3131
description="Red Hat OpenShift Serverless 1 Eventing Event Display" \
3232
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Event Display" \
3333
io.k8s.description="Red Hat OpenShift Serverless Eventing Event Display" \
34-
io.openshift.tags="event-display"
35-
34+
io.openshift.tags="event-display" \
35+
vendor="Red Hat, Inc." \
36+
release=$VERSION \
37+
cpe="cpe:/a:redhat:openshift_serverless:1.36::el8"
38+
3639
ENTRYPOINT ["/usr/bin/event_display"]

openshift/ci-operator/knative-images/filter/Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,17 @@ COPY LICENSE /licenses/
2323
USER 65532
2424

2525
LABEL \
26-
com.redhat.component="openshift-serverless-1-eventing-broker-filter-rhel8-container" \
27-
name="openshift-serverless-1/eventing-broker-filter-rhel8" \
26+
com.redhat.component="openshift-serverless-1-kn-eventing-filter-rhel8-container" \
27+
name="openshift-serverless-1/kn-eventing-filter-rhel8" \
2828
version=$VERSION \
2929
summary="Red Hat OpenShift Serverless 1 Eventing Broker Filter" \
3030
maintainer="[email protected]" \
3131
description="Red Hat OpenShift Serverless 1 Eventing Broker Filter" \
3232
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Broker Filter" \
3333
io.k8s.description="Red Hat OpenShift Serverless Eventing Broker Filter" \
34-
io.openshift.tags="broker-filter"
35-
34+
io.openshift.tags="broker-filter" \
35+
vendor="Red Hat, Inc." \
36+
release=$VERSION \
37+
cpe="cpe:/a:redhat:openshift_serverless:1.36::el8"
38+
3639
ENTRYPOINT ["/usr/bin/filter"]

openshift/ci-operator/knative-images/heartbeats/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ LABEL \
3131
description="Red Hat OpenShift Serverless 1 Eventing Heartbeats" \
3232
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Heartbeats" \
3333
io.k8s.description="Red Hat OpenShift Serverless Eventing Heartbeats" \
34-
io.openshift.tags="heartbeats"
35-
34+
io.openshift.tags="heartbeats" \
35+
vendor="Red Hat, Inc." \
36+
release=$VERSION \
37+
cpe="cpe:/a:redhat:openshift_serverless:1.36::el8"
38+
3639
ENTRYPOINT ["/usr/bin/heartbeats"]

openshift/ci-operator/knative-images/heartbeats_receiver/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ LABEL \
3131
description="Red Hat OpenShift Serverless 1 Eventing Heartbeats Receiver" \
3232
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Heartbeats Receiver" \
3333
io.k8s.description="Red Hat OpenShift Serverless Eventing Heartbeats Receiver" \
34-
io.openshift.tags="heartbeats-receiver"
35-
34+
io.openshift.tags="heartbeats-receiver" \
35+
vendor="Red Hat, Inc." \
36+
release=$VERSION \
37+
cpe="cpe:/a:redhat:openshift_serverless:1.36::el8"
38+
3639
ENTRYPOINT ["/usr/bin/heartbeats_receiver"]

0 commit comments

Comments
 (0)