Skip to content

Commit f74db1a

Browse files
authored
Merge branch 'main' into slsre-523
2 parents 5b0f7a6 + 5d2e02f commit f74db1a

2 files changed

Lines changed: 22 additions & 52 deletions

File tree

.tekton/addon-operator-pull-request.yaml

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ metadata:
1515
"**/go.*".pathChanged() ||
1616
"build/Dockerfile".pathChanged() ||
1717
".tekton/addon-operator-pull-request.yaml".pathChanged() )
18-
creationTimestamp: null
18+
creationTimestamp:
1919
labels:
2020
appstudio.openshift.io/application: addon-operator
2121
appstudio.openshift.io/component: addon-operator
@@ -68,19 +68,13 @@ spec:
6868
name: output-image
6969
type: string
7070
- default: .
71-
description: Path to the source code of an application's component from where
72-
to build image.
71+
description: Path to the source code of an application's component from where to build image.
7372
name: path-context
7473
type: string
7574
- default: Dockerfile
76-
description: Path to the Dockerfile inside the context specified by parameter
77-
path-context
75+
description: Path to the Dockerfile inside the context specified by parameter path-context
7876
name: dockerfile
7977
type: string
80-
- default: "false"
81-
description: Force rebuild image
82-
name: rebuild
83-
type: string
8478
- default: "false"
8579
description: Skip checks against built image
8680
name: skip-checks
@@ -94,8 +88,7 @@ spec:
9488
name: prefetch-input
9589
type: string
9690
- default: ""
97-
description: Image tag expiration time, time values could be something like
98-
1h, 2d, 3w for hours, days, and weeks, respectively.
91+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
9992
name: image-expires-after
10093
type: string
10194
- default: "false"
@@ -115,8 +108,7 @@ spec:
115108
name: build-args-file
116109
type: string
117110
- default: "false"
118-
description: Whether to enable privileged mode, should be used only with remote
119-
VMs
111+
description: Whether to enable privileged mode, should be used only with remote VMs
120112
name: privileged-nested
121113
type: string
122114
results:
@@ -134,13 +126,6 @@ spec:
134126
value: $(tasks.clone-repository.results.commit)
135127
tasks:
136128
- name: init
137-
params:
138-
- name: image-url
139-
value: $(params.output-image)
140-
- name: rebuild
141-
value: $(params.rebuild)
142-
- name: skip-checks
143-
value: $(params.skip-checks)
144129
taskRef:
145130
params:
146131
- name: name
@@ -191,7 +176,7 @@ spec:
191176
- name: name
192177
value: prefetch-dependencies-oci-ta
193178
- name: bundle
194-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:c07551efbd7fc414ae1245ddd93579b00317fee0734980f539fd8aea3cfcb945
179+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:c664a6df6514b59c3ce53570b0994b45af66ecc89ba2a8e41834eae0622addf6
195180
- name: kind
196181
value: task
197182
resolver: bundles
@@ -234,7 +219,7 @@ spec:
234219
- name: name
235220
value: buildah-oci-ta
236221
- name: bundle
237-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.8@sha256:6eb38e7dede283e48aec619572f52f2589513f668d0345d084cf99133bbaa39c
222+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.8@sha256:fc685d7c25a3ce588d8bd52306023f57e16402c22507c857a9914f947c99c829
238223
- name: kind
239224
value: task
240225
resolver: bundles
@@ -343,7 +328,7 @@ spec:
343328
- name: name
344329
value: ecosystem-cert-preflight-checks
345330
- name: bundle
346-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:f99d2bdb02f13223d494077a2cde31418d09369f33c02134a8e7e5fad2f61eda
331+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:64ec9d88ee72f6f317afa22173c60ed2158d92580a8c639b0480dbe60af9580b
347332
- name: kind
348333
value: task
349334
resolver: bundles
@@ -509,7 +494,7 @@ spec:
509494
- name: name
510495
value: sast-unicode-check-oci-ta
511496
- name: bundle
512-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.2@sha256:3f99dc4634a62e1530324cd565d12323ca82be3cfa8a031a36b210becfa7b552
497+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.4@sha256:b38140b2f0b2163def80e28a792b2702245d38a5610a504f2e56c198f3b8f70b
513498
- name: kind
514499
value: task
515500
resolver: bundles
@@ -531,7 +516,7 @@ spec:
531516
- name: name
532517
value: apply-tags
533518
- name: bundle
534-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:a3c2f4cf3164a50570371d7765db74ad406fdbc86a4c9bf5b401f520f14b549f
519+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.3@sha256:510b6d2a3b188adeb716e49566b57d611ab36bd69a2794b5ddfc11dbf014c2ca
535520
- name: kind
536521
value: task
537522
resolver: bundles
@@ -571,7 +556,7 @@ spec:
571556
- name: name
572557
value: rpms-signature-scan
573558
- name: bundle
574-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:2f3015ac7a642ea7f104d2194a8cb45921570f9539c6604ddcb5f62796f22a53
559+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:2f3015ac7a642ea7f104d2194a8cb45921570f9539c6604ddcb5f62796f22a53
575560
- name: kind
576561
value: task
577562
resolver: bundles

.tekton/addon-operator-push.yaml

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ metadata:
1414
"**/go.*".pathChanged() ||
1515
"build/Dockerfile".pathChanged() ||
1616
".tekton/addon-operator-push.yaml".pathChanged() )
17-
creationTimestamp: null
17+
creationTimestamp:
1818
labels:
1919
appstudio.openshift.io/application: addon-operator
2020
appstudio.openshift.io/component: addon-operator
@@ -65,19 +65,13 @@ spec:
6565
name: output-image
6666
type: string
6767
- default: .
68-
description: Path to the source code of an application's component from where
69-
to build image.
68+
description: Path to the source code of an application's component from where to build image.
7069
name: path-context
7170
type: string
7271
- default: Dockerfile
73-
description: Path to the Dockerfile inside the context specified by parameter
74-
path-context
72+
description: Path to the Dockerfile inside the context specified by parameter path-context
7573
name: dockerfile
7674
type: string
77-
- default: "false"
78-
description: Force rebuild image
79-
name: rebuild
80-
type: string
8175
- default: "false"
8276
description: Skip checks against built image
8377
name: skip-checks
@@ -91,8 +85,7 @@ spec:
9185
name: prefetch-input
9286
type: string
9387
- default: ""
94-
description: Image tag expiration time, time values could be something like
95-
1h, 2d, 3w for hours, days, and weeks, respectively.
88+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
9689
name: image-expires-after
9790
type: string
9891
- default: "false"
@@ -112,8 +105,7 @@ spec:
112105
name: build-args-file
113106
type: string
114107
- default: "false"
115-
description: Whether to enable privileged mode, should be used only with remote
116-
VMs
108+
description: Whether to enable privileged mode, should be used only with remote VMs
117109
name: privileged-nested
118110
type: string
119111
results:
@@ -131,13 +123,6 @@ spec:
131123
value: $(tasks.clone-repository.results.commit)
132124
tasks:
133125
- name: init
134-
params:
135-
- name: image-url
136-
value: $(params.output-image)
137-
- name: rebuild
138-
value: $(params.rebuild)
139-
- name: skip-checks
140-
value: $(params.skip-checks)
141126
taskRef:
142127
params:
143128
- name: name
@@ -188,7 +173,7 @@ spec:
188173
- name: name
189174
value: prefetch-dependencies-oci-ta
190175
- name: bundle
191-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:c07551efbd7fc414ae1245ddd93579b00317fee0734980f539fd8aea3cfcb945
176+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:c664a6df6514b59c3ce53570b0994b45af66ecc89ba2a8e41834eae0622addf6
192177
- name: kind
193178
value: task
194179
resolver: bundles
@@ -231,7 +216,7 @@ spec:
231216
- name: name
232217
value: buildah-oci-ta
233218
- name: bundle
234-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.8@sha256:6eb38e7dede283e48aec619572f52f2589513f668d0345d084cf99133bbaa39c
219+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.8@sha256:fc685d7c25a3ce588d8bd52306023f57e16402c22507c857a9914f947c99c829
235220
- name: kind
236221
value: task
237222
resolver: bundles
@@ -340,7 +325,7 @@ spec:
340325
- name: name
341326
value: ecosystem-cert-preflight-checks
342327
- name: bundle
343-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:f99d2bdb02f13223d494077a2cde31418d09369f33c02134a8e7e5fad2f61eda
328+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:64ec9d88ee72f6f317afa22173c60ed2158d92580a8c639b0480dbe60af9580b
344329
- name: kind
345330
value: task
346331
resolver: bundles
@@ -506,7 +491,7 @@ spec:
506491
- name: name
507492
value: sast-unicode-check-oci-ta
508493
- name: bundle
509-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.2@sha256:3f99dc4634a62e1530324cd565d12323ca82be3cfa8a031a36b210becfa7b552
494+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.4@sha256:b38140b2f0b2163def80e28a792b2702245d38a5610a504f2e56c198f3b8f70b
510495
- name: kind
511496
value: task
512497
resolver: bundles
@@ -528,7 +513,7 @@ spec:
528513
- name: name
529514
value: apply-tags
530515
- name: bundle
531-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:a3c2f4cf3164a50570371d7765db74ad406fdbc86a4c9bf5b401f520f14b549f
516+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.3@sha256:510b6d2a3b188adeb716e49566b57d611ab36bd69a2794b5ddfc11dbf014c2ca
532517
- name: kind
533518
value: task
534519
resolver: bundles
@@ -568,7 +553,7 @@ spec:
568553
- name: name
569554
value: rpms-signature-scan
570555
- name: bundle
571-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:2f3015ac7a642ea7f104d2194a8cb45921570f9539c6604ddcb5f62796f22a53
556+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:2f3015ac7a642ea7f104d2194a8cb45921570f9539c6604ddcb5f62796f22a53
572557
- name: kind
573558
value: task
574559
resolver: bundles

0 commit comments

Comments
 (0)