Skip to content

Commit c5429f2

Browse files
authored
Merge branch 'lightspeed-core:main' into LCORE_598_RBAC_E2E_tests
2 parents 024051a + 7ae3f9a commit c5429f2

11 files changed

Lines changed: 474 additions & 82 deletions

File tree

.tekton/lightspeed-stack-pull-request.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ spec:
229229
- name: name
230230
value: prefetch-dependencies-oci-ta
231231
- name: bundle
232-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:36207773434bfad80fc3991d3ccca409d8429dbf5974c4dcd8d54145235b4b7b
232+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:4c9ff416bfd127e1f960bd0218127c7e198dbd15827c1a8bf58ac5eb023dd9e2
233233
- name: kind
234234
value: task
235235
resolver: bundles
@@ -370,7 +370,7 @@ spec:
370370
- name: name
371371
value: deprecated-image-check
372372
- name: bundle
373-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:808fe09bb5b8503de569de097ae5dd619a7488110f79e8e215e69862ee3fce6d
373+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:1cf21de671be4c97d4973b60c09c912997cd15b65c30b93a07eff1b24f43a1f8
374374
- name: kind
375375
value: task
376376
resolver: bundles
@@ -397,7 +397,7 @@ spec:
397397
- name: name
398398
value: clair-scan
399399
- name: bundle
400-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:7c2a32de9021f16f6e8df08a55f539f12e00ea4d96f6fb37f9ea04167032c61f
400+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:654b989d7cdc03d082e56f216a29de04847215ee379a8d9ca315e453ad2b15c2
401401
- name: kind
402402
value: task
403403
resolver: bundles
@@ -422,7 +422,7 @@ spec:
422422
- name: name
423423
value: ecosystem-cert-preflight-checks
424424
- name: bundle
425-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:04f75593558f79a27da2336400bc63d460bf0c5669e3c13f40ee2fb650b1ad1e
425+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:b612fd73d81822113e2c12f44a72eed218540aaa8e9f3e42223bddb01a0689cb
426426
- name: kind
427427
value: task
428428
resolver: bundles
@@ -450,7 +450,7 @@ spec:
450450
- name: name
451451
value: sast-snyk-check-oci-ta
452452
- name: bundle
453-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:0eca130f289a1a1069a1b92943479f79aa7324e4e68d6396fd777ccd97058f50
453+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:49b7d09db82e6cad98152db8f16707ca3d90a1709e846e3ed8c91a433c88724f
454454
- name: kind
455455
value: task
456456
resolver: bundles
@@ -477,7 +477,7 @@ spec:
477477
- name: name
478478
value: clamav-scan
479479
- name: bundle
480-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:f3d2d179cddcc07d0228d9f52959a233037a3afa2619d0a8b2effbb467db80c3
480+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b2f25599a10ab0846e4659f76b5b78c0fddf561404656fda52055eda31e70d83
481481
- name: kind
482482
value: task
483483
resolver: bundles
@@ -522,7 +522,7 @@ spec:
522522
- name: name
523523
value: sast-coverity-check-oci-ta
524524
- name: bundle
525-
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:78f5244a8cfd28c890ed62db7e4ff1fc97ff39876d37fb19f1b0c2c286a4002c
525+
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:9978b6163d54473a72ded5eb9b75d9ffae92118e544c7b96dc805cd66870b12d
526526
- name: kind
527527
value: task
528528
resolver: bundles
@@ -543,7 +543,7 @@ spec:
543543
- name: name
544544
value: coverity-availability-check
545545
- name: bundle
546-
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:36400873d3031df128c55aa71ee11d322c3e55fd8f13dc5779098fbc117c0aa3
546+
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:267d5bc069a0323f41e24732ddfd1057e5c639e853d1e620c67505fab78f1301
547547
- name: kind
548548
value: task
549549
resolver: bundles
@@ -569,7 +569,7 @@ spec:
569569
- name: name
570570
value: sast-shell-check-oci-ta
571571
- name: bundle
572-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:d44336d7bcbd1f7cedee639357a493bd1f661e2859e49e11a34644bdf6819c4e
572+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:e7a51575f9188a1461d4520da25aaa4efdd3b896c97dc750941fa22840e55c13
573573
- name: kind
574574
value: task
575575
resolver: bundles
@@ -595,7 +595,7 @@ spec:
595595
- name: name
596596
value: sast-unicode-check-oci-ta
597597
- name: bundle
598-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:e5a8d3e8e7be7246a1460385b95c084ea6e8fe7520d40fe4389deb90f1bf5176
598+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:8817f5081c10d9debf25601d6d99d7eddde19435be1ff24741d9025931639959
599599
- name: kind
600600
value: task
601601
resolver: bundles
@@ -617,7 +617,7 @@ spec:
617617
- name: name
618618
value: apply-tags
619619
- name: bundle
620-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:c89cd10b2a3f4c43789c5f06ef2b86f528b28f156c20af5e751fa8c0facd457d
620+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.3@sha256:510b6d2a3b188adeb716e49566b57d611ab36bd69a2794b5ddfc11dbf014c2ca
621621
- name: kind
622622
value: task
623623
resolver: bundles
@@ -657,7 +657,7 @@ spec:
657657
- name: name
658658
value: rpms-signature-scan
659659
- name: bundle
660-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:0b10508c82ccb0f5a06a66ce7af56e9bfd40651ddefdf0f499988e897771ee28
660+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:00417785ba16344c10e8682bf58eeb6ef058cedd88ae2d86bb14ced220135374
661661
- name: kind
662662
value: task
663663
resolver: bundles

.tekton/lightspeed-stack-push.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ spec:
215215
- name: name
216216
value: prefetch-dependencies-oci-ta
217217
- name: bundle
218-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:36207773434bfad80fc3991d3ccca409d8429dbf5974c4dcd8d54145235b4b7b
218+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:4c9ff416bfd127e1f960bd0218127c7e198dbd15827c1a8bf58ac5eb023dd9e2
219219
- name: kind
220220
value: task
221221
resolver: bundles
@@ -352,7 +352,7 @@ spec:
352352
- name: name
353353
value: deprecated-image-check
354354
- name: bundle
355-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:808fe09bb5b8503de569de097ae5dd619a7488110f79e8e215e69862ee3fce6d
355+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:1cf21de671be4c97d4973b60c09c912997cd15b65c30b93a07eff1b24f43a1f8
356356
- name: kind
357357
value: task
358358
resolver: bundles
@@ -379,7 +379,7 @@ spec:
379379
- name: name
380380
value: clair-scan
381381
- name: bundle
382-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:7c2a32de9021f16f6e8df08a55f539f12e00ea4d96f6fb37f9ea04167032c61f
382+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:654b989d7cdc03d082e56f216a29de04847215ee379a8d9ca315e453ad2b15c2
383383
- name: kind
384384
value: task
385385
resolver: bundles
@@ -404,7 +404,7 @@ spec:
404404
- name: name
405405
value: ecosystem-cert-preflight-checks
406406
- name: bundle
407-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:04f75593558f79a27da2336400bc63d460bf0c5669e3c13f40ee2fb650b1ad1e
407+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:b612fd73d81822113e2c12f44a72eed218540aaa8e9f3e42223bddb01a0689cb
408408
- name: kind
409409
value: task
410410
resolver: bundles
@@ -432,7 +432,7 @@ spec:
432432
- name: name
433433
value: sast-snyk-check-oci-ta
434434
- name: bundle
435-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:0eca130f289a1a1069a1b92943479f79aa7324e4e68d6396fd777ccd97058f50
435+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:49b7d09db82e6cad98152db8f16707ca3d90a1709e846e3ed8c91a433c88724f
436436
- name: kind
437437
value: task
438438
resolver: bundles
@@ -459,7 +459,7 @@ spec:
459459
- name: name
460460
value: clamav-scan
461461
- name: bundle
462-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:f3d2d179cddcc07d0228d9f52959a233037a3afa2619d0a8b2effbb467db80c3
462+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b2f25599a10ab0846e4659f76b5b78c0fddf561404656fda52055eda31e70d83
463463
- name: kind
464464
value: task
465465
resolver: bundles
@@ -504,7 +504,7 @@ spec:
504504
- name: name
505505
value: sast-coverity-check-oci-ta
506506
- name: bundle
507-
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:78f5244a8cfd28c890ed62db7e4ff1fc97ff39876d37fb19f1b0c2c286a4002c
507+
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:9978b6163d54473a72ded5eb9b75d9ffae92118e544c7b96dc805cd66870b12d
508508
- name: kind
509509
value: task
510510
resolver: bundles
@@ -525,7 +525,7 @@ spec:
525525
- name: name
526526
value: coverity-availability-check
527527
- name: bundle
528-
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:36400873d3031df128c55aa71ee11d322c3e55fd8f13dc5779098fbc117c0aa3
528+
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:267d5bc069a0323f41e24732ddfd1057e5c639e853d1e620c67505fab78f1301
529529
- name: kind
530530
value: task
531531
resolver: bundles
@@ -551,7 +551,7 @@ spec:
551551
- name: name
552552
value: sast-shell-check-oci-ta
553553
- name: bundle
554-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:d44336d7bcbd1f7cedee639357a493bd1f661e2859e49e11a34644bdf6819c4e
554+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:e7a51575f9188a1461d4520da25aaa4efdd3b896c97dc750941fa22840e55c13
555555
- name: kind
556556
value: task
557557
resolver: bundles
@@ -577,7 +577,7 @@ spec:
577577
- name: name
578578
value: sast-unicode-check-oci-ta
579579
- name: bundle
580-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:e5a8d3e8e7be7246a1460385b95c084ea6e8fe7520d40fe4389deb90f1bf5176
580+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:8817f5081c10d9debf25601d6d99d7eddde19435be1ff24741d9025931639959
581581
- name: kind
582582
value: task
583583
resolver: bundles
@@ -599,7 +599,7 @@ spec:
599599
- name: name
600600
value: apply-tags
601601
- name: bundle
602-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:c89cd10b2a3f4c43789c5f06ef2b86f528b28f156c20af5e751fa8c0facd457d
602+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.3@sha256:510b6d2a3b188adeb716e49566b57d611ab36bd69a2794b5ddfc11dbf014c2ca
603603
- name: kind
604604
value: task
605605
resolver: bundles
@@ -639,7 +639,7 @@ spec:
639639
- name: name
640640
value: rpms-signature-scan
641641
- name: bundle
642-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:0b10508c82ccb0f5a06a66ce7af56e9bfd40651ddefdf0f499988e897771ee28
642+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:00417785ba16344c10e8682bf58eeb6ef058cedd88ae2d86bb14ced220135374
643643
- name: kind
644644
value: task
645645
resolver: bundles

docs/config.html

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,45 @@ <h2 id="authorizationconfiguration">AuthorizationConfiguration</h2>
334334
</tr>
335335
</tbody>
336336
</table>
337+
<h2 id="azureentraidconfiguration">AzureEntraIdConfiguration</h2>
338+
<p>Microsoft Entra ID authentication attributes for Azure.</p>
339+
<table>
340+
<colgroup>
341+
<col style="width: 26%"/>
342+
<col style="width: 23%"/>
343+
<col style="width: 50%"/>
344+
</colgroup>
345+
<thead>
346+
<tr class="header">
347+
<th>Field</th>
348+
<th>Type</th>
349+
<th>Description</th>
350+
</tr>
351+
</thead>
352+
<tbody>
353+
<tr class="odd">
354+
<td>tenant_id</td>
355+
<td>string</td>
356+
<td/>
357+
</tr>
358+
<tr class="even">
359+
<td>client_id</td>
360+
<td>string</td>
361+
<td/>
362+
</tr>
363+
<tr class="odd">
364+
<td>client_secret</td>
365+
<td>string</td>
366+
<td/>
367+
</tr>
368+
<tr class="even">
369+
<td>scope</td>
370+
<td>string</td>
371+
<td>Azure Cognitive Services scope for token requests. Override only if
372+
using a different Azure service.</td>
373+
</tr>
374+
</tbody>
375+
</table>
337376
<h2 id="byokrag">ByokRag</h2>
338377
<p>BYOK (Bring Your Own Knowledge) RAG configuration.</p>
339378
<table>
@@ -547,6 +586,11 @@ <h2 id="configuration">Configuration</h2>
547586
<td/>
548587
<td>Quota handlers configuration</td>
549588
</tr>
589+
<tr class="odd">
590+
<td>azure_entra_id</td>
591+
<td/>
592+
<td/>
593+
</tr>
550594
</tbody>
551595
</table>
552596
<h2 id="conversationhistoryconfiguration">ConversationHistoryConfiguration</h2>
@@ -957,6 +1001,11 @@ <h2 id="modelcontextprotocolserver">ModelContextProtocolServer</h2>
9571001
</li>
9581002
</ul>
9591003
<table>
1004+
<colgroup>
1005+
<col style="width: 26%"/>
1006+
<col style="width: 23%"/>
1007+
<col style="width: 50%"/>
1008+
</colgroup>
9601009
<thead>
9611010
<tr class="header">
9621011
<th>Field</th>
@@ -980,6 +1029,23 @@ <h2 id="modelcontextprotocolserver">ModelContextProtocolServer</h2>
9801029
<td>string</td>
9811030
<td>URL of the MCP server</td>
9821031
</tr>
1032+
<tr class="even">
1033+
<td>authorization_headers</td>
1034+
<td>object</td>
1035+
<td>Headers to send to the MCP server. The map contains the header name
1036+
and the path to a file containing the header value (secret). There are 2
1037+
special cases: 1. Usage of the kubernetes token in the header. To
1038+
specify this use a string &#x2018;kubernetes&#x2019; instead of the file path. 2.
1039+
Usage of the client provided token in the header. To specify this use a
1040+
string &#x2018;client&#x2019; instead of the file path.</td>
1041+
</tr>
1042+
<tr class="odd">
1043+
<td>timeout</td>
1044+
<td>integer</td>
1045+
<td>Timeout in seconds for requests to the MCP server. If not specified,
1046+
the default timeout from Llama Stack will be used. Note: This field is
1047+
reserved for future use when Llama Stack adds timeout support.</td>
1048+
</tr>
9831049
</tbody>
9841050
</table>
9851051
<h2 id="postgresqldatabaseconfiguration">PostgreSQLDatabaseConfiguration</h2>

docs/config.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,20 @@ Authorization configuration.
9191
| access_rules | array | Rules for role-based access control |
9292

9393

94+
## AzureEntraIdConfiguration
95+
96+
97+
Microsoft Entra ID authentication attributes for Azure.
98+
99+
100+
| Field | Type | Description |
101+
|-------|------|-------------|
102+
| tenant_id | string | |
103+
| client_id | string | |
104+
| client_secret | string | |
105+
| scope | string | Azure Cognitive Services scope for token requests. Override only if using a different Azure service. |
106+
107+
94108
## ByokRag
95109

96110

@@ -153,6 +167,7 @@ Global service configuration.
153167
| byok_rag | array | BYOK RAG configuration. This configuration can be used to reconfigure Llama Stack through its run.yaml configuration file |
154168
| a2a_state | | Configuration for A2A protocol persistent state storage. |
155169
| quota_handlers | | Quota handlers configuration |
170+
| azure_entra_id | | |
156171

157172

158173
## ConversationHistoryConfiguration
@@ -353,6 +368,8 @@ Useful resources:
353368
| name | string | MCP server name that must be unique |
354369
| provider_id | string | MCP provider identification |
355370
| url | string | URL of the MCP server |
371+
| authorization_headers | object | Headers to send to the MCP server. The map contains the header name and the path to a file containing the header value (secret). There are 2 special cases: 1. Usage of the kubernetes token in the header. To specify this use a string 'kubernetes' instead of the file path. 2. Usage of the client provided token in the header. To specify this use a string 'client' instead of the file path. |
372+
| timeout | integer | Timeout in seconds for requests to the MCP server. If not specified, the default timeout from Llama Stack will be used. Note: This field is reserved for future use when Llama Stack adds timeout support. |
356373

357374

358375
## PostgreSQLDatabaseConfiguration

0 commit comments

Comments
 (0)