Skip to content

Commit 4b3de47

Browse files
authored
Merge pull request #449 from securesign/konflux-sa-migration-backfill-redis
Konflux build pipeline service account migration
2 parents d9ed95f + d66ca29 commit 4b3de47

File tree

2 files changed

+55
-47
lines changed

2 files changed

+55
-47
lines changed

.tekton/backfill-redis-pull-request.yaml

Lines changed: 27 additions & 23 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.backfill-redis.rh".pathChanged() || ".tekton/backfill-redis-pull-request.yaml".pathChanged() || "trigger-konflux-builds.txt".pathChanged() || "go.mod".pathChanged() || "go.sum".pathChanged() || "cmd/backfill-redis".pathChanged() || "pkg".pathChanged() || "Makefile".pathChanged() )
10+
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
11+
== "main" && ( "Dockerfile.backfill-redis.rh".pathChanged() || ".tekton/backfill-redis-pull-request.yaml".pathChanged()
12+
|| "trigger-konflux-builds.txt".pathChanged() || "go.mod".pathChanged() || "go.sum".pathChanged()
13+
|| "cmd/backfill-redis".pathChanged() || "pkg".pathChanged() || "Makefile".pathChanged()
14+
)
1215
creationTimestamp: null
1316
labels:
1417
appstudio.openshift.io/application: rekor
@@ -35,32 +38,33 @@ spec:
3538
- name: hermetic
3639
value: "true"
3740
- name: prefetch-input
38-
value: [{"path": ".", "type": "gomod"}, {"path": "./hack/tools", "type": "gomod"}]
41+
value: '[{"path":".","type":"gomod"},{"path":"./hack/tools","type":"gomod"}]'
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-backfill-redis
6468
workspaces:
6569
- name: git-auth
6670
secret:

.tekton/backfill-redis-push.yaml

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@ apiVersion: tekton.dev/v1
22
kind: PipelineRun
33
metadata:
44
annotations:
5+
build.appstudio.openshift.io/build-nudge-files: controllers/constants/*
56
build.appstudio.openshift.io/repo: https://github.com/securesign/rekor?rev={{revision}}
67
build.appstudio.redhat.com/commit_sha: '{{revision}}'
78
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
89
pipelinesascode.tekton.dev/max-keep-runs: "3"
9-
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" &&
10-
( "Dockerfile.backfill-redis.rh".pathChanged() || ".tekton/backfill-redis-push.yaml".pathChanged() || "trigger-konflux-builds.txt".pathChanged() || "go.mod".pathChanged() || "go.sum".pathChanged() || "cmd/backfill-redis".pathChanged() || "pkg".pathChanged() || "Makefile".pathChanged() )
11-
build.appstudio.openshift.io/build-nudge-files: "controllers/constants/*"
10+
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
11+
== "main" && ( "Dockerfile.backfill-redis.rh".pathChanged() || ".tekton/backfill-redis-push.yaml".pathChanged()
12+
|| "trigger-konflux-builds.txt".pathChanged() || "go.mod".pathChanged() || "go.sum".pathChanged()
13+
|| "cmd/backfill-redis".pathChanged() || "pkg".pathChanged() || "Makefile".pathChanged()
14+
)
1215
creationTimestamp: null
1316
labels:
1417
appstudio.openshift.io/application: rekor
@@ -33,32 +36,33 @@ spec:
3336
- name: hermetic
3437
value: "true"
3538
- name: prefetch-input
36-
value: [{"path": ".", "type": "gomod"}, {"path": "./hack/tools", "type": "gomod"}]
39+
value: '[{"path":".","type":"gomod"},{"path":"./hack/tools","type":"gomod"}]'
3740
- name: go_unit_test
38-
value: true
41+
value: "true"
3942
- name: go_base_image
4043
value: brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23.4@sha256:5c6607f82aeb2cd3f71075d17555d4170b17927e8551967d2fd0e534b22b1c7b
41-
taskRunSpecs:
42-
- pipelineTaskName: prefetch-dependencies
43-
stepSpecs:
44-
- name: prefetch-dependencies
45-
computeResources:
46-
requests:
47-
cpu: '3'
48-
memory: 3Gi
49-
limits:
50-
cpu: '3'
51-
memory: 3Gi
5244
pipelineRef:
53-
resolver: git
5445
params:
55-
- name: url
56-
value: 'https://github.com/securesign/pipelines.git'
57-
- name: revision
58-
value: 'main'
59-
- name: pathInRepo
60-
value: 'pipelines/docker-build-oci-ta.yaml'
61-
taskRunTemplate: {}
46+
- name: url
47+
value: https://github.com/securesign/pipelines.git
48+
- name: revision
49+
value: main
50+
- name: pathInRepo
51+
value: pipelines/docker-build-oci-ta.yaml
52+
resolver: git
53+
taskRunSpecs:
54+
- pipelineTaskName: prefetch-dependencies
55+
stepSpecs:
56+
- computeResources:
57+
limits:
58+
cpu: "3"
59+
memory: 3Gi
60+
requests:
61+
cpu: "3"
62+
memory: 3Gi
63+
name: prefetch-dependencies
64+
taskRunTemplate:
65+
serviceAccountName: build-pipeline-backfill-redis
6266
workspaces:
6367
- name: git-auth
6468
secret:

0 commit comments

Comments
 (0)