Skip to content

Commit 8c53c72

Browse files
red-hat-konflux[bot]konflux
andauthored
Konflux build pipeline service account migration for registry-viewer-main (#221)
Signed-off-by: konflux <[email protected]> Co-authored-by: konflux <[email protected]>
1 parent 9fee8ec commit 8c53c72

File tree

2 files changed

+94
-88
lines changed

2 files changed

+94
-88
lines changed

.tekton/registry-viewer-main-pull-request.yaml

Lines changed: 47 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ 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 == "main"
11-
creationTimestamp:
10+
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
11+
== "main"
12+
creationTimestamp: null
1213
labels:
1314
appstudio.openshift.io/application: devfile-registry-main
1415
appstudio.openshift.io/component: registry-viewer-main
@@ -63,11 +64,13 @@ spec:
6364
name: output-image
6465
type: string
6566
- default: .
66-
description: Path to the source code of an application's component from where to build image.
67+
description: Path to the source code of an application's component from where
68+
to build image.
6769
name: path-context
6870
type: string
6971
- default: Dockerfile
70-
description: Path to the Dockerfile inside the context specified by parameter path-context
72+
description: Path to the Dockerfile inside the context specified by parameter
73+
path-context
7174
name: dockerfile
7275
type: string
7376
- default: "false"
@@ -87,7 +90,8 @@ spec:
8790
name: prefetch-input
8891
type: string
8992
- default: ""
90-
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
93+
description: Image tag expiration time, time values could be something like
94+
1h, 2d, 3w for hours, days, and weeks, respectively.
9195
name: image-expires-after
9296
- default: "false"
9397
description: Build a source image.
@@ -381,56 +385,54 @@ spec:
381385
- "false"
382386
- name: sast-shell-check
383387
params:
384-
- name: image-digest
385-
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
386-
- name: image-url
387-
value: $(tasks.build-image-index.results.IMAGE_URL)
388-
- name: SOURCE_ARTIFACT
389-
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
390-
- name: CACHI2_ARTIFACT
391-
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
388+
- name: image-digest
389+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
390+
- name: image-url
391+
value: $(tasks.build-image-index.results.IMAGE_URL)
392+
- name: SOURCE_ARTIFACT
393+
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
394+
- name: CACHI2_ARTIFACT
395+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
392396
runAfter:
393-
- build-image-index
397+
- build-image-index
394398
taskRef:
395399
params:
396-
- name: name
397-
value: sast-shell-check-oci-ta
398-
- name: bundle
399-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:57b3262138eb06186ae7375f84ca53788bba2a66cfd03d39cb82c78df050aba5
400-
- name: kind
401-
value: task
400+
- name: name
401+
value: sast-shell-check-oci-ta
402+
- name: bundle
403+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:57b3262138eb06186ae7375f84ca53788bba2a66cfd03d39cb82c78df050aba5
404+
- name: kind
405+
value: task
402406
resolver: bundles
403407
when:
404-
- input: $(params.skip-checks)
405-
operator: in
406-
values:
407-
- "false"
408-
workspaces: []
408+
- input: $(params.skip-checks)
409+
operator: in
410+
values:
411+
- "false"
409412
- name: sast-unicode-check
410413
params:
411-
- name: image-url
412-
value: $(tasks.build-image-index.results.IMAGE_URL)
413-
- name: SOURCE_ARTIFACT
414-
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
415-
- name: CACHI2_ARTIFACT
416-
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
414+
- name: image-url
415+
value: $(tasks.build-image-index.results.IMAGE_URL)
416+
- name: SOURCE_ARTIFACT
417+
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
418+
- name: CACHI2_ARTIFACT
419+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
417420
runAfter:
418-
- build-image-index
421+
- build-image-index
419422
taskRef:
420423
params:
421-
- name: name
422-
value: sast-unicode-check-oci-ta
423-
- name: bundle
424-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.1@sha256:424f2f659c02998dc3a43e1ce869e3148982c59adb74f953f8fa91ff1c9ab86e
425-
- name: kind
426-
value: task
424+
- name: name
425+
value: sast-unicode-check-oci-ta
426+
- name: bundle
427+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.1@sha256:424f2f659c02998dc3a43e1ce869e3148982c59adb74f953f8fa91ff1c9ab86e
428+
- name: kind
429+
value: task
427430
resolver: bundles
428431
when:
429-
- input: $(params.skip-checks)
430-
operator: in
431-
values:
432-
- "false"
433-
workspaces: []
432+
- input: $(params.skip-checks)
433+
operator: in
434+
values:
435+
- "false"
434436
- name: clamav-scan
435437
params:
436438
- name: image-digest
@@ -582,7 +584,8 @@ spec:
582584
optional: true
583585
- name: netrc
584586
optional: true
585-
taskRunTemplate: {}
587+
taskRunTemplate:
588+
serviceAccountName: build-pipeline-registry-viewer-main
586589
workspaces:
587590
- name: git-auth
588591
secret:

.tekton/registry-viewer-main-push.yaml

Lines changed: 47 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ metadata:
66
build.appstudio.redhat.com/commit_sha: '{{revision}}'
77
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
88
pipelinesascode.tekton.dev/max-keep-runs: "3"
9-
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main"
10-
creationTimestamp:
9+
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
10+
== "main"
11+
creationTimestamp: null
1112
labels:
1213
appstudio.openshift.io/application: devfile-registry-main
1314
appstudio.openshift.io/component: registry-viewer-main
@@ -60,11 +61,13 @@ spec:
6061
name: output-image
6162
type: string
6263
- default: .
63-
description: Path to the source code of an application's component from where to build image.
64+
description: Path to the source code of an application's component from where
65+
to build image.
6466
name: path-context
6567
type: string
6668
- default: Dockerfile
67-
description: Path to the Dockerfile inside the context specified by parameter path-context
69+
description: Path to the Dockerfile inside the context specified by parameter
70+
path-context
6871
name: dockerfile
6972
type: string
7073
- default: "false"
@@ -84,7 +87,8 @@ spec:
8487
name: prefetch-input
8588
type: string
8689
- default: ""
87-
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
90+
description: Image tag expiration time, time values could be something like
91+
1h, 2d, 3w for hours, days, and weeks, respectively.
8892
name: image-expires-after
8993
- default: "false"
9094
description: Build a source image.
@@ -378,56 +382,54 @@ spec:
378382
- "false"
379383
- name: sast-shell-check
380384
params:
381-
- name: image-digest
382-
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
383-
- name: image-url
384-
value: $(tasks.build-image-index.results.IMAGE_URL)
385-
- name: SOURCE_ARTIFACT
386-
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
387-
- name: CACHI2_ARTIFACT
388-
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
385+
- name: image-digest
386+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
387+
- name: image-url
388+
value: $(tasks.build-image-index.results.IMAGE_URL)
389+
- name: SOURCE_ARTIFACT
390+
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
391+
- name: CACHI2_ARTIFACT
392+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
389393
runAfter:
390-
- build-image-index
394+
- build-image-index
391395
taskRef:
392396
params:
393-
- name: name
394-
value: sast-shell-check-oci-ta
395-
- name: bundle
396-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:57b3262138eb06186ae7375f84ca53788bba2a66cfd03d39cb82c78df050aba5
397-
- name: kind
398-
value: task
397+
- name: name
398+
value: sast-shell-check-oci-ta
399+
- name: bundle
400+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:57b3262138eb06186ae7375f84ca53788bba2a66cfd03d39cb82c78df050aba5
401+
- name: kind
402+
value: task
399403
resolver: bundles
400404
when:
401-
- input: $(params.skip-checks)
402-
operator: in
403-
values:
404-
- "false"
405-
workspaces: []
405+
- input: $(params.skip-checks)
406+
operator: in
407+
values:
408+
- "false"
406409
- name: sast-unicode-check
407410
params:
408-
- name: image-url
409-
value: $(tasks.build-image-index.results.IMAGE_URL)
410-
- name: SOURCE_ARTIFACT
411-
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
412-
- name: CACHI2_ARTIFACT
413-
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
411+
- name: image-url
412+
value: $(tasks.build-image-index.results.IMAGE_URL)
413+
- name: SOURCE_ARTIFACT
414+
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
415+
- name: CACHI2_ARTIFACT
416+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
414417
runAfter:
415-
- build-image-index
418+
- build-image-index
416419
taskRef:
417420
params:
418-
- name: name
419-
value: sast-unicode-check-oci-ta
420-
- name: bundle
421-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.1@sha256:424f2f659c02998dc3a43e1ce869e3148982c59adb74f953f8fa91ff1c9ab86e
422-
- name: kind
423-
value: task
421+
- name: name
422+
value: sast-unicode-check-oci-ta
423+
- name: bundle
424+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.1@sha256:424f2f659c02998dc3a43e1ce869e3148982c59adb74f953f8fa91ff1c9ab86e
425+
- name: kind
426+
value: task
424427
resolver: bundles
425428
when:
426-
- input: $(params.skip-checks)
427-
operator: in
428-
values:
429-
- "false"
430-
workspaces: []
429+
- input: $(params.skip-checks)
430+
operator: in
431+
values:
432+
- "false"
431433
- name: clamav-scan
432434
params:
433435
- name: image-digest
@@ -582,7 +584,8 @@ spec:
582584
optional: true
583585
- name: netrc
584586
optional: true
585-
taskRunTemplate: {}
587+
taskRunTemplate:
588+
serviceAccountName: build-pipeline-registry-viewer-main
586589
workspaces:
587590
- name: git-auth
588591
secret:

0 commit comments

Comments
 (0)