Skip to content

Commit 45df95d

Browse files
authored
Merge pull request #639 from openshift/konflux-sa-migration-osc-must-gather
Konflux build pipeline service account migration
2 parents ec1ec49 + 9e3c760 commit 45df95d

File tree

2 files changed

+26
-14
lines changed

2 files changed

+26
-14
lines changed

.tekton/osc-must-gather-pull-request.yaml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ 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 == "devel" && ( "must-gather/***".pathChanged() || ".tekton/osc-must-gather-pull-request.yaml".pathChanged() )
11-
creationTimestamp:
10+
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
11+
== "devel" && ( "must-gather/***".pathChanged() || ".tekton/osc-must-gather-pull-request.yaml".pathChanged()
12+
)
13+
creationTimestamp: null
1214
labels:
1315
appstudio.openshift.io/application: openshift-sandboxed-containers
1416
appstudio.openshift.io/component: osc-must-gather
@@ -85,11 +87,13 @@ spec:
8587
name: output-image
8688
type: string
8789
- default: .
88-
description: Path to the source code of an application's component from where to build image.
90+
description: Path to the source code of an application's component from where
91+
to build image.
8992
name: path-context
9093
type: string
9194
- default: Dockerfile
92-
description: Path to the Dockerfile inside the context specified by parameter path-context
95+
description: Path to the Dockerfile inside the context specified by parameter
96+
path-context
9397
name: dockerfile
9498
type: string
9599
- default: "false"
@@ -109,7 +113,8 @@ spec:
109113
name: prefetch-input
110114
type: string
111115
- default: ""
112-
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
116+
description: Image tag expiration time, time values could be something like
117+
1h, 2d, 3w for hours, days, and weeks, respectively.
113118
name: image-expires-after
114119
- default: "false"
115120
description: Build a source image.
@@ -599,12 +604,13 @@ spec:
599604
optional: true
600605
- name: netrc
601606
optional: true
602-
taskRunTemplate: {}
607+
taskRunTemplate:
608+
serviceAccountName: build-pipeline-osc-must-gather
603609
workspaces:
604610
- name: workspace
605611
volumeClaimTemplate:
606612
metadata:
607-
creationTimestamp:
613+
creationTimestamp: null
608614
spec:
609615
accessModes:
610616
- ReadWriteOnce

.tekton/osc-must-gather-push.yaml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ 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 == "devel" && ( "must-gather/***".pathChanged() || ".tekton/osc-must-gather-push.yaml".pathChanged() )
10-
creationTimestamp:
9+
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
10+
== "devel" && ( "must-gather/***".pathChanged() || ".tekton/osc-must-gather-push.yaml".pathChanged()
11+
)
12+
creationTimestamp: null
1113
labels:
1214
appstudio.openshift.io/application: openshift-sandboxed-containers
1315
appstudio.openshift.io/component: osc-must-gather
@@ -82,11 +84,13 @@ spec:
8284
name: output-image
8385
type: string
8486
- default: .
85-
description: Path to the source code of an application's component from where to build image.
87+
description: Path to the source code of an application's component from where
88+
to build image.
8689
name: path-context
8790
type: string
8891
- default: Dockerfile
89-
description: Path to the Dockerfile inside the context specified by parameter path-context
92+
description: Path to the Dockerfile inside the context specified by parameter
93+
path-context
9094
name: dockerfile
9195
type: string
9296
- default: "false"
@@ -106,7 +110,8 @@ spec:
106110
name: prefetch-input
107111
type: string
108112
- default: ""
109-
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
113+
description: Image tag expiration time, time values could be something like
114+
1h, 2d, 3w for hours, days, and weeks, respectively.
110115
name: image-expires-after
111116
- default: "false"
112117
description: Build a source image.
@@ -596,12 +601,13 @@ spec:
596601
optional: true
597602
- name: netrc
598603
optional: true
599-
taskRunTemplate: {}
604+
taskRunTemplate:
605+
serviceAccountName: build-pipeline-osc-must-gather
600606
workspaces:
601607
- name: workspace
602608
volumeClaimTemplate:
603609
metadata:
604-
creationTimestamp:
610+
creationTimestamp: null
605611
spec:
606612
accessModes:
607613
- ReadWriteOnce

0 commit comments

Comments
 (0)