Skip to content

Commit 6da3298

Browse files
author
serverless-qe
committed
[release-v1.18] Sync Konflux configurations
1 parent 0338fc3 commit 6da3298

15 files changed

+226
-96
lines changed

‎.konflux/applications/serverless-operator-138/components/imagerepositories/kn-client-client-118.yaml‎ renamed to ‎.konflux/applications/serverless-operator-138/components/imagerepositories/kn-client-cli-artifacts-118.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
image-controller.appstudio.redhat.com/update-component-image: "true"
66
labels:
77
appstudio.redhat.com/application: serverless-operator-138
8-
appstudio.redhat.com/component: kn-client-client-118
9-
name: kn-client-client-118
8+
appstudio.redhat.com/component: kn-client-cli-artifacts-118
9+
name: kn-client-cli-artifacts-118
1010
spec:
1111
image:
12-
name: serverless-operator-138/kn-client-client
12+
name: serverless-operator-138/kn-client-cli-artifacts
1313
visibility: public

‎.konflux/applications/serverless-operator-138/components/kn-client-client-118.yaml‎ renamed to ‎.konflux/applications/serverless-operator-138/components/kn-client-cli-artifacts-118.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ metadata:
44
annotations:
55
build.appstudio.openshift.io/pipeline: '{"name":"docker-build","bundle":"latest"}'
66
build.appstudio.openshift.io/request: configure-pac-no-mr
7-
name: kn-client-client-118
7+
name: kn-client-cli-artifacts-118
88
spec:
9-
componentName: kn-client-client-118
9+
componentName: kn-client-cli-artifacts-118
1010
application: serverless-operator-138
1111

1212
source:
1313
git:
1414
url: https://github.com/openshift-knative/client.git
1515
context:
16-
dockerfileUrl: openshift/ci-operator/knative-images/client/Dockerfile
16+
dockerfileUrl: openshift/ci-operator/knative-images/cli-artifacts/Dockerfile
1717
revision: release-v1.18

‎.tekton/docker-build.yaml‎

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: tekton.dev/v1
22
kind: Pipeline
33
metadata:
4-
creationTimestamp:
4+
creationTimestamp: null
55
labels:
66
pipelines.openshift.io/runtime: generic
77
pipelines.openshift.io/strategy: docker
@@ -13,27 +13,14 @@ 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
3319
- linux/arm64
3420
- linux/ppc64le
3521
- linux/s390x
36-
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.
22+
description: List of platforms to build the container images on. The available
23+
set of values is determined by the configuration of the multi-platform-controller.
3724
name: build-platforms
3825
type: array
3926
- default: --all-projects --org=3e1a4cca-ebfb-495f-b64c-3cc960d566b4 --exclude=test*,vendor,third_party
@@ -45,7 +32,8 @@ spec:
4532
name: build-source-image
4633
type: string
4734
- default: "false"
48-
description: 'Enable in-development package managers. WARNING: the behavior may change at any time without notice. Use at your own risk.'
35+
description: 'Enable in-development package managers. WARNING: the behavior may
36+
change at any time without notice. Use at your own risk.'
4937
name: prefetch-input-dev-package-managers
5038
- default: []
5139
description: Additional image tags
@@ -62,11 +50,13 @@ spec:
6250
name: output-image
6351
type: string
6452
- default: .
65-
description: Path to the source code of an application's component from where to build image.
53+
description: Path to the source code of an application's component from where
54+
to build image.
6655
name: path-context
6756
type: string
6857
- default: Dockerfile
69-
description: Path to the Dockerfile inside the context specified by parameter path-context
58+
description: Path to the Dockerfile inside the context specified by parameter
59+
path-context
7060
name: dockerfile
7161
type: string
7262
- default: "false"
@@ -82,17 +72,23 @@ spec:
8272
name: hermetic
8373
type: string
8474
- default: ""
85-
description: Build dependencies to be prefetched by Cachi2
75+
description: Build dependencies to be prefetched
8676
name: prefetch-input
8777
type: string
8878
- default: ""
89-
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
79+
description: Image tag expiration time, time values could be something like 1h,
80+
2d, 3w for hours, days, and weeks, respectively.
9081
name: image-expires-after
9182
type: string
9283
- default: "true"
9384
description: Add built image into an OCI image index
9485
name: build-image-index
9586
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
9692
- default: []
9793
description: Array of --build-arg values ("arg=value" strings) for buildah
9894
name: build-args
@@ -102,13 +98,10 @@ spec:
10298
name: build-args-file
10399
type: string
104100
- default: "false"
105-
description: Whether to enable privileged mode, should be used only with remote VMs
101+
description: Whether to enable privileged mode, should be used only with remote
102+
VMs
106103
name: privileged-nested
107104
type: string
108-
- name: buildah-format
109-
default: docker
110-
type: string
111-
description: The format for the resulting image's mediaType. Valid values are oci or docker.
112105
results:
113106
- description: ""
114107
name: IMAGE_URL
@@ -272,14 +265,16 @@ spec:
272265
value: $(params.build-args-file)
273266
- name: PRIVILEGED_NESTED
274267
value: $(params.privileged-nested)
268+
- name: SOURCE_URL
269+
value: $(tasks.clone-repository.results.url)
270+
- name: BUILDAH_FORMAT
271+
value: $(params.buildah-format)
275272
- name: SOURCE_ARTIFACT
276273
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
277274
- name: CACHI2_ARTIFACT
278275
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
279276
- name: IMAGE_APPEND_PLATFORM
280277
value: "true"
281-
- name: BUILDAH_FORMAT
282-
value: $(params.buildah-format)
283278
runAfter:
284279
- prefetch-dependencies
285280
taskRef:
@@ -406,7 +401,12 @@ spec:
406401
operator: in
407402
values:
408403
- "false"
409-
- name: ecosystem-cert-preflight-checks
404+
- matrix:
405+
params:
406+
- name: platform
407+
value:
408+
- $(params.build-platforms)
409+
name: ecosystem-cert-preflight-checks
410410
params:
411411
- name: image-url
412412
value: $(tasks.build-image-index.results.IMAGE_URL)
@@ -426,7 +426,12 @@ spec:
426426
operator: in
427427
values:
428428
- "false"
429-
- name: clamav-scan
429+
- matrix:
430+
params:
431+
- name: image-arch
432+
value:
433+
- $(params.build-platforms)
434+
name: clamav-scan
430435
params:
431436
- name: image-digest
432437
value: $(tasks.build-image-index.results.IMAGE_DIGEST)

‎.tekton/kn-client-cli-artifacts-118-pull-request.yaml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
apiVersion: tekton.dev/v1
2+
kind: PipelineRun
3+
metadata:
4+
annotations:
5+
build.appstudio.openshift.io/repo: https://github.com/openshift-knative/client?rev={{revision}}
6+
build.appstudio.redhat.com/commit_sha: '{{revision}}'
7+
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
8+
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
9+
pipelinesascode.tekton.dev/max-keep-runs: "3"
10+
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "release-v1.18"
11+
creationTimestamp: null
12+
labels:
13+
appstudio.openshift.io/application: serverless-operator-138
14+
appstudio.openshift.io/component: kn-client-cli-artifacts-118
15+
pipelines.appstudio.openshift.io/type: build
16+
name: kn-client-cli-artifacts-118-on-pull-request
17+
namespace: ocp-serverless-tenant
18+
spec:
19+
params:
20+
- name: dockerfile
21+
value: openshift/ci-operator/knative-images/cli-artifacts/Dockerfile
22+
- name: build-args
23+
value:
24+
- CLI_ARTIFACTS=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-kn-cli-artifacts-rhel8:1.16.0
25+
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24
26+
- GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
27+
- JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
28+
- JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
29+
- NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
30+
- NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
31+
- VERSION=1.38.0
32+
- name: git-url
33+
value: '{{source_url}}'
34+
- name: hermetic
35+
value: "true"
36+
- name: image-expires-after
37+
value: 5d
38+
- name: output-image
39+
value: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-138/kn-client-cli-artifacts:on-pr-{{revision}}
40+
- name: build-platforms
41+
value:
42+
- linux/x86_64
43+
- name: revision
44+
value: '{{revision}}'
45+
- name: prefetch-input
46+
value: '[{"path":".","type":"gomod"}]'
47+
taskRunSpecs:
48+
- pipelineTaskName: sast-shell-check
49+
stepSpecs:
50+
- name: sast-shell-check
51+
computeResources:
52+
requests:
53+
memory: 4Gi
54+
limits:
55+
memory: 4Gi
56+
pipelineRef:
57+
name: docker-build
58+
taskRunTemplate:
59+
serviceAccountName: build-pipeline-kn-client-cli-artifacts-118
60+
workspaces:
61+
- name: git-auth
62+
secret:
63+
secretName: '{{ git_auth_secret }}'

‎.tekton/kn-client-cli-artifacts-118-push.yaml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
apiVersion: tekton.dev/v1
2+
kind: PipelineRun
3+
metadata:
4+
annotations:
5+
build.appstudio.openshift.io/repo: https://github.com/openshift-knative/client?rev={{revision}}
6+
build.appstudio.redhat.com/commit_sha: '{{revision}}'
7+
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
8+
pipelinesascode.tekton.dev/max-keep-runs: "3"
9+
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-v1.18"
10+
creationTimestamp: null
11+
labels:
12+
appstudio.openshift.io/application: serverless-operator-138
13+
appstudio.openshift.io/component: kn-client-cli-artifacts-118
14+
pipelines.appstudio.openshift.io/type: build
15+
name: kn-client-cli-artifacts-118-on-push
16+
namespace: ocp-serverless-tenant
17+
spec:
18+
params:
19+
- name: dockerfile
20+
value: openshift/ci-operator/knative-images/cli-artifacts/Dockerfile
21+
- name: build-args
22+
value:
23+
- CLI_ARTIFACTS=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-kn-cli-artifacts-rhel8:1.16.0
24+
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24
25+
- GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
26+
- JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
27+
- JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
28+
- NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
29+
- NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
30+
- VERSION=1.38.0
31+
- name: git-url
32+
value: '{{source_url}}'
33+
- name: hermetic
34+
value: "true"
35+
- name: output-image
36+
value: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-138/kn-client-cli-artifacts:{{revision}}
37+
- name: revision
38+
value: '{{revision}}'
39+
- name: additional-tags
40+
value:
41+
- $(context.pipelineRun.uid)-{{revision}}
42+
- 1.38.0
43+
- latest
44+
- name: prefetch-input
45+
value: '[{"path":".","type":"gomod"}]'
46+
taskRunSpecs:
47+
- pipelineTaskName: sast-shell-check
48+
stepSpecs:
49+
- name: sast-shell-check
50+
computeResources:
51+
requests:
52+
memory: 4Gi
53+
limits:
54+
memory: 4Gi
55+
pipelineRef:
56+
name: docker-build
57+
taskRunTemplate:
58+
serviceAccountName: build-pipeline-kn-client-cli-artifacts-118
59+
workspaces:
60+
- name: git-auth
61+
secret:
62+
secretName: '{{ git_auth_secret }}'

‎.tekton/kn-client-kn-118-pull-request.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ spec:
2222
- name: build-args
2323
value:
2424
- CLI_ARTIFACTS=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-kn-cli-artifacts-rhel8:1.16.0
25-
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.24
26-
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
27-
- JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
28-
- JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
29-
- NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
30-
- NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
25+
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24
26+
- GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
27+
- JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
28+
- JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
29+
- NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
30+
- NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
3131
- VERSION=1.38.0
3232
- name: git-url
3333
value: '{{source_url}}'

‎.tekton/kn-client-kn-118-push.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ spec:
2121
- name: build-args
2222
value:
2323
- CLI_ARTIFACTS=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-kn-cli-artifacts-rhel8:1.16.0
24-
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.24
25-
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
26-
- JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
27-
- JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
28-
- NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
29-
- NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
24+
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24
25+
- GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
26+
- JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
27+
- JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
28+
- NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
29+
- NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
3030
- VERSION=1.38.0
3131
- name: git-url
3232
value: '{{source_url}}'

‎.tekton/kn-client-test-grpc-ping-118-pull-request.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ spec:
2222
- name: build-args
2323
value:
2424
- CLI_ARTIFACTS=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-kn-cli-artifacts-rhel8:1.16.0
25-
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.24
26-
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
27-
- JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
28-
- JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
29-
- NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
30-
- NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
25+
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24
26+
- GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
27+
- JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
28+
- JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
29+
- NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
30+
- NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
3131
- VERSION=1.38.0
3232
- name: git-url
3333
value: '{{source_url}}'

‎.tekton/kn-client-test-grpc-ping-118-push.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ spec:
2121
- name: build-args
2222
value:
2323
- CLI_ARTIFACTS=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-kn-cli-artifacts-rhel8:1.16.0
24-
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.24
25-
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
26-
- JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
27-
- JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
28-
- NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
29-
- NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
24+
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24
25+
- GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
26+
- JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
27+
- JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
28+
- NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
29+
- NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
3030
- VERSION=1.38.0
3131
- name: git-url
3232
value: '{{source_url}}'

0 commit comments

Comments
 (0)