Skip to content

Commit f95b166

Browse files
author
serverless-qe
committed
[release-v1.21] Sync Konflux configurations
1 parent 4c2e207 commit f95b166

2 files changed

Lines changed: 32 additions & 20 deletions

File tree

.tekton/docker-build.yaml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,14 @@ spec:
8787
- default: "false"
8888
description: Enable cache proxy configuration
8989
name: enable-cache-proxy
90+
- default: "true"
91+
description: Use the package registry proxy when prefetching dependencies
92+
name: enable-package-registry-proxy
93+
- default: .
94+
description: Target directories in component's source code to scan with SAST tools.
95+
Multiple values should be separated with commas.
96+
name: sast-target-dirs
97+
type: string
9098
- default: []
9199
description: Array of --build-arg values ("arg=value" strings) for buildah
92100
name: build-args
@@ -100,10 +108,6 @@ spec:
100108
VMs
101109
name: privileged-nested
102110
type: string
103-
- name: sast-target-dirs
104-
type: string
105-
default: .
106-
description: Target directories to scan with SAST tools. Multiple values should be separated with commas.
107111
results:
108112
- description: ""
109113
name: IMAGE_URL
@@ -126,12 +130,12 @@ spec:
126130
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
127131
- name: image-url
128132
value: $(tasks.build-image-index.results.IMAGE_URL)
133+
- name: TARGET_DIRS
134+
value: $(params.sast-target-dirs)
129135
- name: SOURCE_ARTIFACT
130136
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
131137
- name: CACHI2_ARTIFACT
132138
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
133-
- name: TARGET_DIRS
134-
value: $(params.sast-target-dirs)
135139
runAfter:
136140
- build-image-index
137141
taskRef:
@@ -154,6 +158,8 @@ spec:
154158
value: $(params.prefetch-input-dev-package-managers)
155159
- name: input
156160
value: $(params.prefetch-input)
161+
- name: enable-package-registry-proxy
162+
value: $(params.enable-package-registry-proxy)
157163
- name: SOURCE_ARTIFACT
158164
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
159165
- name: ociStorage
@@ -440,12 +446,12 @@ spec:
440446
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
441447
- name: image-url
442448
value: $(tasks.build-image-index.results.IMAGE_URL)
449+
- name: TARGET_DIRS
450+
value: $(params.sast-target-dirs)
443451
- name: SOURCE_ARTIFACT
444452
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
445453
- name: CACHI2_ARTIFACT
446454
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
447-
- name: TARGET_DIRS
448-
value: $(params.sast-target-dirs)
449455
runAfter:
450456
- build-image-index
451457
taskRef:
@@ -468,12 +474,12 @@ spec:
468474
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
469475
- name: image-url
470476
value: $(tasks.build-image-index.results.IMAGE_URL)
477+
- name: TARGET_DIRS
478+
value: $(params.sast-target-dirs)
471479
- name: SOURCE_ARTIFACT
472480
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
473481
- name: CACHI2_ARTIFACT
474482
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
475-
- name: TARGET_DIRS
476-
value: $(params.sast-target-dirs)
477483
runAfter:
478484
- build-image-index
479485
taskRef:

.tekton/docker-java-build.yaml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,14 @@ spec:
8787
- default: "false"
8888
description: Enable cache proxy configuration
8989
name: enable-cache-proxy
90+
- default: "true"
91+
description: Use the package registry proxy when prefetching dependencies
92+
name: enable-package-registry-proxy
93+
- default: .
94+
description: Target directories in component's source code to scan with SAST tools.
95+
Multiple values should be separated with commas.
96+
name: sast-target-dirs
97+
type: string
9098
- default: []
9199
description: Array of --build-arg values ("arg=value" strings) for buildah
92100
name: build-args
@@ -100,10 +108,6 @@ spec:
100108
VMs
101109
name: privileged-nested
102110
type: string
103-
- name: sast-target-dirs
104-
type: string
105-
default: .
106-
description: Target directories to scan with SAST tools. Multiple values should be separated with commas.
107111
results:
108112
- description: ""
109113
name: IMAGE_URL
@@ -126,12 +130,12 @@ spec:
126130
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
127131
- name: image-url
128132
value: $(tasks.build-image-index.results.IMAGE_URL)
133+
- name: TARGET_DIRS
134+
value: $(params.sast-target-dirs)
129135
- name: SOURCE_ARTIFACT
130136
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
131137
- name: CACHI2_ARTIFACT
132138
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
133-
- name: TARGET_DIRS
134-
value: $(params.sast-target-dirs)
135139
runAfter:
136140
- build-image-index
137141
taskRef:
@@ -154,6 +158,8 @@ spec:
154158
value: $(params.prefetch-input-dev-package-managers)
155159
- name: input
156160
value: $(params.prefetch-input)
161+
- name: enable-package-registry-proxy
162+
value: $(params.enable-package-registry-proxy)
157163
- name: SOURCE_ARTIFACT
158164
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
159165
- name: ociStorage
@@ -440,12 +446,12 @@ spec:
440446
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
441447
- name: image-url
442448
value: $(tasks.build-image-index.results.IMAGE_URL)
449+
- name: TARGET_DIRS
450+
value: $(params.sast-target-dirs)
443451
- name: SOURCE_ARTIFACT
444452
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
445453
- name: CACHI2_ARTIFACT
446454
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
447-
- name: TARGET_DIRS
448-
value: $(params.sast-target-dirs)
449455
runAfter:
450456
- build-image-index
451457
taskRef:
@@ -468,12 +474,12 @@ spec:
468474
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
469475
- name: image-url
470476
value: $(tasks.build-image-index.results.IMAGE_URL)
477+
- name: TARGET_DIRS
478+
value: $(params.sast-target-dirs)
471479
- name: SOURCE_ARTIFACT
472480
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
473481
- name: CACHI2_ARTIFACT
474482
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
475-
- name: TARGET_DIRS
476-
value: $(params.sast-target-dirs)
477483
runAfter:
478484
- build-image-index
479485
taskRef:

0 commit comments

Comments
 (0)