Skip to content

Commit 24eaf3f

Browse files
InsaneZeinInsaneZein
committed
chore: merge master
2 parents d0256af + b942cf0 commit 24eaf3f

File tree

29 files changed

+988
-332
lines changed

29 files changed

+988
-332
lines changed

‎.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
# These owners will be the default owners for everything in
55
# the repo. Unless a later match takes precedence.
6-
* @RedHatInsights/platform-experience-ui
6+
* @RedHatInsights/experience-ui-committers

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "build-tools"]
2+
path = build-tools
3+
url = https://github.com/RedHatInsights/insights-frontend-builder-common.git

‎.tekton/insights-rbac-ui-pull-request.yaml

+13-74
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
- name: image-expires-after
2828
value: 5d
2929
- name: dockerfile
30-
value: ./Dockerfile
30+
value: ./build-tools/Dockerfile
3131
pipelineSpec:
3232
finally:
3333
- name: show-sbom
@@ -39,7 +39,7 @@ spec:
3939
- name: name
4040
value: show-sbom
4141
- name: bundle
42-
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:945a7c9066d3e0a95d3fddb7e8a6992e4d632a2a75d8f3a9bd2ff2fef0ec9aa0
42+
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:04f15cbce548e1db7770eee3f155ccb2cc0140a6c371dc67e9a34d83673ea0c0
4343
- name: kind
4444
value: task
4545
resolver: bundles
@@ -166,7 +166,7 @@ spec:
166166
- name: name
167167
value: git-clone
168168
- name: bundle
169-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:d091a9e19567a4cbdc5acd57903c71ba71dc51d749a4ba7477e689608851e981
169+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:92cf275b60f7bd23472acc4bc6e9a4bc9a9cbd78a680a23087fa4df668b85a34
170170
- name: kind
171171
value: task
172172
resolver: bundles
@@ -191,7 +191,7 @@ spec:
191191
- name: name
192192
value: prefetch-dependencies
193193
- name: bundle
194-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:54d41cb14ef76d73f372a7e4e8aeef4c2a667e937049398a056408916db727ac
194+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:fb126d78a71fa4cef9046d2563832c91ec73e0d1a7c5811b85e9d28132b7c076
195195
- name: kind
196196
value: task
197197
resolver: bundles
@@ -207,66 +207,6 @@ spec:
207207
workspace: git-auth
208208
- name: netrc
209209
workspace: netrc
210-
- name: parse-build-deploy-script
211-
params:
212-
- name: path-context
213-
value: $(params.path-context)
214-
taskRef:
215-
resolver: git
216-
params:
217-
- name: url
218-
value: https://github.com/RedHatInsights/konflux-consoledot-frontend-build
219-
- name: revision
220-
value: 6ca6bf7cbbe1dd25a5b8e50ebb832041533bf4b3
221-
- name: pathInRepo
222-
value: tasks/parse-build-deploy-script/parse-build-deploy-script.yaml
223-
workspaces:
224-
- name: source
225-
workspace: workspace
226-
runAfter:
227-
- clone-repository
228-
- name: create-frontend-dockerfile
229-
taskRef:
230-
resolver: git
231-
params:
232-
- name: url
233-
value: https://github.com/RedHatInsights/konflux-consoledot-frontend-build
234-
- name: revision
235-
value: 6ca6bf7cbbe1dd25a5b8e50ebb832041533bf4b3
236-
- name: pathInRepo
237-
value: tasks/create-frontend-dockerfile/create-frontend-dockerfile.yaml
238-
workspaces:
239-
- name: source
240-
workspace: workspace
241-
params:
242-
- name: path-context
243-
value: $(params.path-context)
244-
- name: component
245-
value: $(tasks.parse-build-deploy-script.results.component)
246-
- name: image
247-
value: $(tasks.parse-build-deploy-script.results.image)
248-
- name: node-build-version
249-
value: $(tasks.parse-build-deploy-script.results.node-build-version)
250-
- name: quay-expire-time
251-
value: $(tasks.parse-build-deploy-script.results.quay-expire-time)
252-
- name: npm-build-script
253-
value: $(tasks.parse-build-deploy-script.results.npm-build-script)
254-
- name: yarn-build-script
255-
value: $(tasks.parse-build-deploy-script.results.yarn-build-script)
256-
- name: route-path
257-
value: $(tasks.parse-build-deploy-script.results.route-path)
258-
- name: beta-route-path
259-
value: $(tasks.parse-build-deploy-script.results.beta-route-path)
260-
- name: preview-route-path
261-
value: $(tasks.parse-build-deploy-script.results.preview-route-path)
262-
- name: ci-root
263-
value: $(tasks.parse-build-deploy-script.results.ci-root)
264-
- name: server-name
265-
value: $(tasks.parse-build-deploy-script.results.server-name)
266-
- name: dist-folder
267-
value: $(tasks.parse-build-deploy-script.results.dist-folder)
268-
runAfter:
269-
- parse-build-deploy-script
270210
- name: clone-repository-oci-ta
271211
params:
272212
- name: url
@@ -321,7 +261,7 @@ spec:
321261
sidecars:
322262
steps:
323263
- name: use-trusted-artifact
324-
image: quay.io/redhat-appstudio/build-trusted-artifacts:latest@sha256:ff35e09ff5c89e54538b50abae241a765b2b7868f05d62c4835bebf0978f3659
264+
image: quay.io/redhat-appstudio/build-trusted-artifacts:latest@sha256:9b180776a41d9a22a1c51539f1647c60defbbd55b44bbebdd4130e33512d8b0d
325265
args:
326266
- use
327267
- $(params.SOURCE_ARTIFACT)=/var/workdir
@@ -367,13 +307,12 @@ spec:
367307
value: $(params.build-args-file)
368308
runAfter:
369309
- prefetch-dependencies
370-
- create-frontend-dockerfile
371310
taskRef:
372311
params:
373312
- name: name
374313
value: buildah
375314
- name: bundle
376-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.4@sha256:8c1927de5164e87bceba44c2cdfcb14a14359a23c4158e631046dd5e50ce1e52
315+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.4@sha256:ead333b20003e0875cdb5b73dce1c355f8e70e950d87153d711c7fe617bdb3f5
377316
- name: kind
378317
value: task
379318
resolver: bundles
@@ -396,7 +335,7 @@ spec:
396335
- name: name
397336
value: source-build
398337
- name: bundle
399-
value: quay.io/konflux-ci/tekton-catalog/task-source-build:0.2@sha256:50b50ca7dd65e0132769021f8cfbb2db7c799adea7b4e3a8968b425bbde1e8eb
338+
value: quay.io/konflux-ci/tekton-catalog/task-source-build:0.2@sha256:6de42f19b1bc021657f0e94fce9995cdd841c9378a732948ae2a347422e0f613
400339
- name: kind
401340
value: task
402341
resolver: bundles
@@ -425,7 +364,7 @@ spec:
425364
- name: name
426365
value: rpms-signature-scan
427366
- name: bundle
428-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:3bf6d1bcd57af1095b06b4c489f965551364b1f1f72a807de9cab3c23142dca5
367+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:5bc61290c6d56cb3d61409efdf522574e7d08a497f362d7456ed33d56189c4f9
429368
- name: kind
430369
value: task
431370
resolver: bundles
@@ -442,7 +381,7 @@ spec:
442381
- name: name
443382
value: deprecated-image-check
444383
- name: bundle
445-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:ced089bd8d86f95ee70f6ee1a6941d677f1c66c3b8f02fa60f9309c6c32e1929
384+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:a0a5b05286e3df5045432b3da3cc11224a831e05bc77c927cbfd00381f7f6235
446385
- name: kind
447386
value: task
448387
resolver: bundles
@@ -464,7 +403,7 @@ spec:
464403
- name: name
465404
value: clair-scan
466405
- name: bundle
467-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:f636f2cbe91d9d4d9685a38c8bc680a36e17f568ec0e60a93da82d1284b488c5
406+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:c45aae9e7d4449e1ea3ef0fc59dec84b77831329ae2b03c1578e02bd051a2863
468407
- name: kind
469408
value: task
470409
resolver: bundles
@@ -506,7 +445,7 @@ spec:
506445
- name: name
507446
value: sast-snyk-check
508447
- name: bundle
509-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.3@sha256:30cc34ccf6ca34e7f0951fd508fe4436d07388e7244baab77baf4ef9bdcefff4
448+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.3@sha256:ea2d3e305e9c8c41fafe5cea9148502ffd650f0ddfd889eee480eea85e0427e5
510449
- name: kind
511450
value: task
512451
resolver: bundles
@@ -531,7 +470,7 @@ spec:
531470
- name: name
532471
value: clamav-scan
533472
- name: bundle
534-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:0db068e8a59612472a2483f5113893d0c5c9102e9ad7647d9a4789360e5bc2dc
473+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:7595ba07e6bf3737a7ce51e0d75e43bd2658a9b9c5b59e161c005029ac758b3d
535474
- name: kind
536475
value: task
537476
resolver: bundles
@@ -572,7 +511,7 @@ spec:
572511
- name: name
573512
value: push-dockerfile
574513
- name: bundle
575-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile:0.1@sha256:ba6b3182b8f7e1f9054b67cdafb338140136bb357c8d434cf28f6d569b5cb07f
514+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile:0.1@sha256:86ba936a94bfad7a295fbceaa6531e33b9fc1f8fc2d5c44d93fc4e3af760bd1e
576515
- name: kind
577516
value: task
578517
resolver: bundles

‎.tekton/insights-rbac-ui-push.yaml

+13-74
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
- name: output-image
2525
value: quay.io/redhat-user-workloads/rh-platform-experien-tenant/insights-rbac-ui/insights-rbac-ui:{{revision}}
2626
- name: dockerfile
27-
value: ./Dockerfile
27+
value: ./build-tools/Dockerfile
2828
pipelineSpec:
2929
finally:
3030
- name: show-sbom
@@ -36,7 +36,7 @@ spec:
3636
- name: name
3737
value: show-sbom
3838
- name: bundle
39-
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:945a7c9066d3e0a95d3fddb7e8a6992e4d632a2a75d8f3a9bd2ff2fef0ec9aa0
39+
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:04f15cbce548e1db7770eee3f155ccb2cc0140a6c371dc67e9a34d83673ea0c0
4040
- name: kind
4141
value: task
4242
resolver: bundles
@@ -163,7 +163,7 @@ spec:
163163
- name: name
164164
value: git-clone
165165
- name: bundle
166-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:d091a9e19567a4cbdc5acd57903c71ba71dc51d749a4ba7477e689608851e981
166+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:92cf275b60f7bd23472acc4bc6e9a4bc9a9cbd78a680a23087fa4df668b85a34
167167
- name: kind
168168
value: task
169169
resolver: bundles
@@ -188,7 +188,7 @@ spec:
188188
- name: name
189189
value: prefetch-dependencies
190190
- name: bundle
191-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:54d41cb14ef76d73f372a7e4e8aeef4c2a667e937049398a056408916db727ac
191+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:fb126d78a71fa4cef9046d2563832c91ec73e0d1a7c5811b85e9d28132b7c076
192192
- name: kind
193193
value: task
194194
resolver: bundles
@@ -204,66 +204,6 @@ spec:
204204
workspace: git-auth
205205
- name: netrc
206206
workspace: netrc
207-
- name: parse-build-deploy-script
208-
params:
209-
- name: path-context
210-
value: $(params.path-context)
211-
taskRef:
212-
resolver: git
213-
params:
214-
- name: url
215-
value: https://github.com/RedHatInsights/konflux-consoledot-frontend-build
216-
- name: revision
217-
value: 6ca6bf7cbbe1dd25a5b8e50ebb832041533bf4b3
218-
- name: pathInRepo
219-
value: tasks/parse-build-deploy-script/parse-build-deploy-script.yaml
220-
workspaces:
221-
- name: source
222-
workspace: workspace
223-
runAfter:
224-
- clone-repository
225-
- name: create-frontend-dockerfile
226-
taskRef:
227-
resolver: git
228-
params:
229-
- name: url
230-
value: https://github.com/RedHatInsights/konflux-consoledot-frontend-build
231-
- name: revision
232-
value: 6ca6bf7cbbe1dd25a5b8e50ebb832041533bf4b3
233-
- name: pathInRepo
234-
value: tasks/create-frontend-dockerfile/create-frontend-dockerfile.yaml
235-
workspaces:
236-
- name: source
237-
workspace: workspace
238-
params:
239-
- name: path-context
240-
value: $(params.path-context)
241-
- name: component
242-
value: $(tasks.parse-build-deploy-script.results.component)
243-
- name: image
244-
value: $(tasks.parse-build-deploy-script.results.image)
245-
- name: node-build-version
246-
value: $(tasks.parse-build-deploy-script.results.node-build-version)
247-
- name: quay-expire-time
248-
value: $(tasks.parse-build-deploy-script.results.quay-expire-time)
249-
- name: npm-build-script
250-
value: $(tasks.parse-build-deploy-script.results.npm-build-script)
251-
- name: yarn-build-script
252-
value: $(tasks.parse-build-deploy-script.results.yarn-build-script)
253-
- name: route-path
254-
value: $(tasks.parse-build-deploy-script.results.route-path)
255-
- name: beta-route-path
256-
value: $(tasks.parse-build-deploy-script.results.beta-route-path)
257-
- name: preview-route-path
258-
value: $(tasks.parse-build-deploy-script.results.preview-route-path)
259-
- name: ci-root
260-
value: $(tasks.parse-build-deploy-script.results.ci-root)
261-
- name: server-name
262-
value: $(tasks.parse-build-deploy-script.results.server-name)
263-
- name: dist-folder
264-
value: $(tasks.parse-build-deploy-script.results.dist-folder)
265-
runAfter:
266-
- parse-build-deploy-script
267207
- name: clone-repository-oci-ta
268208
params:
269209
- name: url
@@ -318,7 +258,7 @@ spec:
318258
sidecars:
319259
steps:
320260
- name: use-trusted-artifact
321-
image: quay.io/redhat-appstudio/build-trusted-artifacts:latest@sha256:ff35e09ff5c89e54538b50abae241a765b2b7868f05d62c4835bebf0978f3659
261+
image: quay.io/redhat-appstudio/build-trusted-artifacts:latest@sha256:9b180776a41d9a22a1c51539f1647c60defbbd55b44bbebdd4130e33512d8b0d
322262
args:
323263
- use
324264
- $(params.SOURCE_ARTIFACT)=/var/workdir
@@ -364,13 +304,12 @@ spec:
364304
value: $(params.build-args-file)
365305
runAfter:
366306
- prefetch-dependencies
367-
- create-frontend-dockerfile
368307
taskRef:
369308
params:
370309
- name: name
371310
value: buildah
372311
- name: bundle
373-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.4@sha256:8c1927de5164e87bceba44c2cdfcb14a14359a23c4158e631046dd5e50ce1e52
312+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.4@sha256:ead333b20003e0875cdb5b73dce1c355f8e70e950d87153d711c7fe617bdb3f5
374313
- name: kind
375314
value: task
376315
resolver: bundles
@@ -393,7 +332,7 @@ spec:
393332
- name: name
394333
value: source-build
395334
- name: bundle
396-
value: quay.io/konflux-ci/tekton-catalog/task-source-build:0.2@sha256:50b50ca7dd65e0132769021f8cfbb2db7c799adea7b4e3a8968b425bbde1e8eb
335+
value: quay.io/konflux-ci/tekton-catalog/task-source-build:0.2@sha256:6de42f19b1bc021657f0e94fce9995cdd841c9378a732948ae2a347422e0f613
397336
- name: kind
398337
value: task
399338
resolver: bundles
@@ -422,7 +361,7 @@ spec:
422361
- name: name
423362
value: rpms-signature-scan
424363
- name: bundle
425-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:3bf6d1bcd57af1095b06b4c489f965551364b1f1f72a807de9cab3c23142dca5
364+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:5bc61290c6d56cb3d61409efdf522574e7d08a497f362d7456ed33d56189c4f9
426365
- name: kind
427366
value: task
428367
resolver: bundles
@@ -439,7 +378,7 @@ spec:
439378
- name: name
440379
value: deprecated-image-check
441380
- name: bundle
442-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:ced089bd8d86f95ee70f6ee1a6941d677f1c66c3b8f02fa60f9309c6c32e1929
381+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:a0a5b05286e3df5045432b3da3cc11224a831e05bc77c927cbfd00381f7f6235
443382
- name: kind
444383
value: task
445384
resolver: bundles
@@ -461,7 +400,7 @@ spec:
461400
- name: name
462401
value: clair-scan
463402
- name: bundle
464-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:f636f2cbe91d9d4d9685a38c8bc680a36e17f568ec0e60a93da82d1284b488c5
403+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:c45aae9e7d4449e1ea3ef0fc59dec84b77831329ae2b03c1578e02bd051a2863
465404
- name: kind
466405
value: task
467406
resolver: bundles
@@ -503,7 +442,7 @@ spec:
503442
- name: name
504443
value: sast-snyk-check
505444
- name: bundle
506-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.3@sha256:30cc34ccf6ca34e7f0951fd508fe4436d07388e7244baab77baf4ef9bdcefff4
445+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.3@sha256:ea2d3e305e9c8c41fafe5cea9148502ffd650f0ddfd889eee480eea85e0427e5
507446
- name: kind
508447
value: task
509448
resolver: bundles
@@ -528,7 +467,7 @@ spec:
528467
- name: name
529468
value: clamav-scan
530469
- name: bundle
531-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:0db068e8a59612472a2483f5113893d0c5c9102e9ad7647d9a4789360e5bc2dc
470+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:7595ba07e6bf3737a7ce51e0d75e43bd2658a9b9c5b59e161c005029ac758b3d
532471
- name: kind
533472
value: task
534473
resolver: bundles
@@ -569,7 +508,7 @@ spec:
569508
- name: name
570509
value: push-dockerfile
571510
- name: bundle
572-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile:0.1@sha256:ba6b3182b8f7e1f9054b67cdafb338140136bb357c8d434cf28f6d569b5cb07f
511+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile:0.1@sha256:86ba936a94bfad7a295fbceaa6531e33b9fc1f8fc2d5c44d93fc4e3af760bd1e
573512
- name: kind
574513
value: task
575514
resolver: bundles

0 commit comments

Comments
 (0)