Skip to content

Commit cf4b01e

Browse files
committed
Use trusted artifact version for the konflux pipelines
Signed-off-by: Gang Li <[email protected]>
1 parent b995851 commit cf4b01e

File tree

2 files changed

+82
-152
lines changed

2 files changed

+82
-152
lines changed

Diff for: .tekton/charon-pull-request.yaml

+41-76
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ metadata:
77
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
88
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
99
pipelinesascode.tekton.dev/max-keep-runs: "3"
10-
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
11-
== "konflux"
12-
creationTimestamp: null
10+
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "konflux"
11+
creationTimestamp:
1312
labels:
1413
appstudio.openshift.io/application: charon
1514
appstudio.openshift.io/component: charon
@@ -45,28 +44,6 @@ spec:
4544
- name: kind
4645
value: task
4746
resolver: bundles
48-
- name: show-summary
49-
params:
50-
- name: pipelinerun-name
51-
value: $(context.pipelineRun.name)
52-
- name: git-url
53-
value: $(tasks.clone-repository.results.url)?rev=$(tasks.clone-repository.results.commit)
54-
- name: image-url
55-
value: $(params.output-image)
56-
- name: build-task-status
57-
value: $(tasks.build-image-index.status)
58-
taskRef:
59-
params:
60-
- name: name
61-
value: summary
62-
- name: bundle
63-
value: quay.io/konflux-ci/tekton-catalog/task-summary:0.2@sha256:d97c04ab42f277b1103eb6f3a053b247849f4f5b3237ea302a8ecada3b24e15b
64-
- name: kind
65-
value: task
66-
resolver: bundles
67-
workspaces:
68-
- name: workspace
69-
workspace: workspace
7047
params:
7148
- description: Source Repository URL
7249
name: git-url
@@ -79,13 +56,11 @@ spec:
7956
name: output-image
8057
type: string
8158
- default: .
82-
description: Path to the source code of an application's component from where
83-
to build image.
59+
description: Path to the source code of an application's component from where to build image.
8460
name: path-context
8561
type: string
8662
- default: Dockerfile
87-
description: Path to the Dockerfile inside the context specified by parameter
88-
path-context
63+
description: Path to the Dockerfile inside the context specified by parameter path-context
8964
name: dockerfile
9065
type: string
9166
- default: "false"
@@ -105,8 +80,7 @@ spec:
10580
name: prefetch-input
10681
type: string
10782
- default: ""
108-
description: Image tag expiration time, time values could be something like
109-
1h, 2d, 3w for hours, days, and weeks, respectively.
83+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
11084
name: image-expires-after
11185
- default: "false"
11286
description: Build a source image.
@@ -161,14 +135,18 @@ spec:
161135
value: $(params.git-url)
162136
- name: revision
163137
value: $(params.revision)
138+
- name: ociStorage
139+
value: $(params.output-image).git
140+
- name: ociArtifactExpiresAfter
141+
value: $(params.image-expires-after)
164142
runAfter:
165143
- init
166144
taskRef:
167145
params:
168146
- name: name
169-
value: git-clone
147+
value: git-clone-oci-ta
170148
- name: bundle
171-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:0bb1be8363557e8e07ec34a3c5daaaaa23c9d533f0bb12f00dc604d00de50814
149+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:8ab0c7a7ac4a4c59740a24304e17cc64fe8745376d19396c4660fc0e1a957a1b
172150
- name: kind
173151
value: task
174152
resolver: bundles
@@ -178,33 +156,30 @@ spec:
178156
values:
179157
- "true"
180158
workspaces:
181-
- name: output
182-
workspace: workspace
183159
- name: basic-auth
184160
workspace: git-auth
185161
- name: prefetch-dependencies
186162
params:
187163
- name: input
188164
value: $(params.prefetch-input)
165+
- name: SOURCE_ARTIFACT
166+
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
167+
- name: ociStorage
168+
value: $(params.output-image).prefetch
169+
- name: ociArtifactExpiresAfter
170+
value: $(params.image-expires-after)
189171
runAfter:
190172
- clone-repository
191173
taskRef:
192174
params:
193175
- name: name
194-
value: prefetch-dependencies
176+
value: prefetch-dependencies-oci-ta
195177
- name: bundle
196-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.1@sha256:058a59f72997c9cf1be20978eb6a145d8d4d436c6098f2460bd96766bb363b20
178+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.1@sha256:3e51d7c477ba00bd0c7de2d8f89269131646d2582e631b9aee91fb4b022d4555
197179
- name: kind
198180
value: task
199181
resolver: bundles
200-
when:
201-
- input: $(params.prefetch-input)
202-
operator: notin
203-
values:
204-
- ""
205182
workspaces:
206-
- name: source
207-
workspace: workspace
208183
- name: git-basic-auth
209184
workspace: git-auth
210185
- name: netrc
@@ -230,14 +205,18 @@ spec:
230205
- $(params.build-args[*])
231206
- name: BUILD_ARGS_FILE
232207
value: $(params.build-args-file)
208+
- name: SOURCE_ARTIFACT
209+
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
210+
- name: CACHI2_ARTIFACT
211+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
233212
runAfter:
234213
- prefetch-dependencies
235214
taskRef:
236215
params:
237216
- name: name
238-
value: buildah
217+
value: buildah-oci-ta
239218
- name: bundle
240-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.2@sha256:a523f60203d90e149f96ec776b47ce85a7acfd6d634ddfc18f4a03f14e08ea0e
219+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.2@sha256:e0f1ec1ec43ba0f9533dd70fe76a3c24ac3ca14ddd83036099c8073c94dc8258
241220
- name: kind
242221
value: task
243222
resolver: bundles
@@ -246,9 +225,6 @@ spec:
246225
operator: in
247226
values:
248227
- "true"
249-
workspaces:
250-
- name: source
251-
workspace: workspace
252228
- name: build-image-index
253229
params:
254230
- name: IMAGE
@@ -282,14 +258,18 @@ spec:
282258
params:
283259
- name: BINARY_IMAGE
284260
value: $(params.output-image)
261+
- name: SOURCE_ARTIFACT
262+
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
263+
- name: CACHI2_ARTIFACT
264+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
285265
runAfter:
286266
- build-image-index
287267
taskRef:
288268
params:
289269
- name: name
290-
value: source-build
270+
value: source-build-oci-ta
291271
- name: bundle
292-
value: quay.io/konflux-ci/tekton-catalog/task-source-build:0.1@sha256:21cb5ebaff7a9216903cf78933dc4ec4dd6283a52636b16590a5f52ceb278269
272+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:26278e5373a726594975a9ec2f177a67e3674bbf905d7d317b9ea60ca7993978
293273
- name: kind
294274
value: task
295275
resolver: bundles
@@ -302,9 +282,6 @@ spec:
302282
operator: in
303283
values:
304284
- "true"
305-
workspaces:
306-
- name: workspace
307-
workspace: workspace
308285
- name: deprecated-base-image-check
309286
params:
310287
- name: IMAGE_URL
@@ -375,14 +352,18 @@ spec:
375352
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
376353
- name: image-url
377354
value: $(tasks.build-image-index.results.IMAGE_URL)
355+
- name: SOURCE_ARTIFACT
356+
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
357+
- name: CACHI2_ARTIFACT
358+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
378359
runAfter:
379360
- build-image-index
380361
taskRef:
381362
params:
382363
- name: name
383-
value: sast-snyk-check
364+
value: sast-snyk-check-oci-ta
384365
- name: bundle
385-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.2@sha256:82c42d27c9c59db6cf6c235e89f7b37f5cdfc75d0d361ca0ee91ae703ba72301
366+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.3@sha256:6d232347739a0366dcfc4e40afbcb5d1937dd3fea8952afb1bd6a4b0c5d1c1f5
386367
- name: kind
387368
value: task
388369
resolver: bundles
@@ -391,9 +372,6 @@ spec:
391372
operator: in
392373
values:
393374
- "false"
394-
workspaces:
395-
- name: workspace
396-
workspace: workspace
397375
- name: clamav-scan
398376
params:
399377
- name: image-digest
@@ -441,39 +419,26 @@ spec:
441419
value: $(params.dockerfile)
442420
- name: CONTEXT
443421
value: $(params.path-context)
422+
- name: SOURCE_ARTIFACT
423+
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
444424
runAfter:
445425
- build-image-index
446426
taskRef:
447427
params:
448428
- name: name
449-
value: push-dockerfile
429+
value: push-dockerfile-oci-ta
450430
- name: bundle
451-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile:0.1@sha256:92d63edd09636f97961ca18fac14b67935179d2c14b4a4d5f8087c614e8c2bd9
431+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:08ef41d6a98608bd5f1de75d77f015f520911a278d1875e174b88b9d04db2441
452432
- name: kind
453433
value: task
454434
resolver: bundles
455-
workspaces:
456-
- name: workspace
457-
workspace: workspace
458435
workspaces:
459-
- name: workspace
460436
- name: git-auth
461437
optional: true
462438
- name: netrc
463439
optional: true
464440
taskRunTemplate: {}
465441
workspaces:
466-
- name: workspace
467-
volumeClaimTemplate:
468-
metadata:
469-
creationTimestamp: null
470-
spec:
471-
accessModes:
472-
- ReadWriteOnce
473-
resources:
474-
requests:
475-
storage: 1Gi
476-
status: {}
477442
- name: git-auth
478443
secret:
479444
secretName: '{{ git_auth_secret }}'

0 commit comments

Comments
 (0)