Skip to content

Commit 969aef5

Browse files
authored
Merge pull request #450 from securesign/konflux-sa-migration-rekor-cli
Konflux build pipeline service account migration
2 parents 4b3de47 + 5ea3cec commit 969aef5

File tree

2 files changed

+52
-44
lines changed

2 files changed

+52
-44
lines changed

.tekton/rekor-cli-pull-request.yaml

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@ 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-
( "Dockerfile.rekor-cli.rh".pathChanged() || ".tekton/rekor-cli-pull-request.yaml".pathChanged() || "trigger-konflux-builds.txt".pathChanged() || "go.mod".pathChanged() || "go.sum".pathChanged() || "cmd/rekor-cli".pathChanged() || "pkg".pathChanged() || "Makefile".pathChanged() || "Build.mak".pathChanged() )
10+
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
11+
== "main" && ( "Dockerfile.rekor-cli.rh".pathChanged() || ".tekton/rekor-cli-pull-request.yaml".pathChanged()
12+
|| "trigger-konflux-builds.txt".pathChanged() || "go.mod".pathChanged() || "go.sum".pathChanged()
13+
|| "cmd/rekor-cli".pathChanged() || "pkg".pathChanged() || "Makefile".pathChanged()
14+
|| "Build.mak".pathChanged() )
1215
creationTimestamp: null
1316
labels:
1417
appstudio.openshift.io/application: rekor
@@ -37,30 +40,31 @@ spec:
3740
- name: build-source-image
3841
value: "true"
3942
- name: go_unit_test
40-
value: true
43+
value: "true"
4144
- name: go_base_image
4245
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23.4@sha256:5c6607f82aeb2cd3f71075d17555d4170b17927e8551967d2fd0e534b22b1c7b
43-
taskRunSpecs:
44-
- pipelineTaskName: prefetch-dependencies
45-
stepSpecs:
46-
- name: prefetch-dependencies
47-
computeResources:
48-
requests:
49-
cpu: '3'
50-
memory: 3Gi
51-
limits:
52-
cpu: '3'
53-
memory: 3Gi
5446
pipelineRef:
55-
resolver: git
5647
params:
57-
- name: url
58-
value: 'https://github.com/securesign/pipelines.git'
59-
- name: revision
60-
value: 'main'
61-
- name: pathInRepo
62-
value: 'pipelines/docker-build-oci-ta.yaml'
63-
taskRunTemplate: {}
48+
- name: url
49+
value: https://github.com/securesign/pipelines.git
50+
- name: revision
51+
value: main
52+
- name: pathInRepo
53+
value: pipelines/docker-build-oci-ta.yaml
54+
resolver: git
55+
taskRunSpecs:
56+
- pipelineTaskName: prefetch-dependencies
57+
stepSpecs:
58+
- computeResources:
59+
limits:
60+
cpu: "3"
61+
memory: 3Gi
62+
requests:
63+
cpu: "3"
64+
memory: 3Gi
65+
name: prefetch-dependencies
66+
taskRunTemplate:
67+
serviceAccountName: build-pipeline-rekor-cli
6468
workspaces:
6569
- name: git-auth
6670
secret:

.tekton/rekor-cli-push.yaml

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@ 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-
( "Dockerfile.rekor-cli.rh".pathChanged() || ".tekton/rekor-cli-push.yaml".pathChanged() || "trigger-konflux-builds.txt".pathChanged() || "go.mod".pathChanged() || "go.sum".pathChanged() || "cmd/rekor-cli".pathChanged() || "pkg".pathChanged() || "Makefile".pathChanged() || "Build.mak".pathChanged() )
9+
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
10+
== "main" && ( "Dockerfile.rekor-cli.rh".pathChanged() || ".tekton/rekor-cli-push.yaml".pathChanged()
11+
|| "trigger-konflux-builds.txt".pathChanged() || "go.mod".pathChanged() || "go.sum".pathChanged()
12+
|| "cmd/rekor-cli".pathChanged() || "pkg".pathChanged() || "Makefile".pathChanged()
13+
|| "Build.mak".pathChanged() )
1114
creationTimestamp: null
1215
labels:
1316
appstudio.openshift.io/application: rekor
@@ -34,30 +37,31 @@ spec:
3437
- name: build-source-image
3538
value: "true"
3639
- name: go_unit_test
37-
value: true
40+
value: "true"
3841
- name: go_base_image
3942
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23.4@sha256:5c6607f82aeb2cd3f71075d17555d4170b17927e8551967d2fd0e534b22b1c7b
40-
taskRunSpecs:
41-
- pipelineTaskName: prefetch-dependencies
42-
stepSpecs:
43-
- name: prefetch-dependencies
44-
computeResources:
45-
requests:
46-
cpu: '3'
47-
memory: 3Gi
48-
limits:
49-
cpu: '3'
50-
memory: 3Gi
5143
pipelineRef:
52-
resolver: git
5344
params:
54-
- name: url
55-
value: 'https://github.com/securesign/pipelines.git'
56-
- name: revision
57-
value: 'main'
58-
- name: pathInRepo
59-
value: 'pipelines/docker-build-oci-ta.yaml'
60-
taskRunTemplate: {}
45+
- name: url
46+
value: https://github.com/securesign/pipelines.git
47+
- name: revision
48+
value: main
49+
- name: pathInRepo
50+
value: pipelines/docker-build-oci-ta.yaml
51+
resolver: git
52+
taskRunSpecs:
53+
- pipelineTaskName: prefetch-dependencies
54+
stepSpecs:
55+
- computeResources:
56+
limits:
57+
cpu: "3"
58+
memory: 3Gi
59+
requests:
60+
cpu: "3"
61+
memory: 3Gi
62+
name: prefetch-dependencies
63+
taskRunTemplate:
64+
serviceAccountName: build-pipeline-rekor-cli
6165
workspaces:
6266
- name: git-auth
6367
secret:

0 commit comments

Comments
 (0)