Skip to content

Commit 4ca6161

Browse files
authored
Merge branch 'lightspeed-core:main' into LCORE_2035_koflux_tls_e2e_fix
2 parents 7940b75 + bf9b8a7 commit 4ca6161

22 files changed

Lines changed: 2570 additions & 305 deletions

.tekton/lightspeed-stack-push.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ apiVersion: tekton.dev/v1
22
kind: PipelineRun
33
metadata:
44
annotations:
5+
# Cross-repo nudge: after each push build, the Konflux nudge controller
6+
# opens an MR in lscore-deploy (gitlab.cee.redhat.com/rhel-lightspeed/lscore-deploy)
7+
# to bump the image digest in openshift/lightspeed-stack.yml. See RSPEED-3082.
8+
build.appstudio.openshift.io/build-nudge-files: "openshift/lightspeed-stack.yml"
59
build.appstudio.openshift.io/repo: https://github.com/lightspeed-core/lightspeed-stack?rev={{revision}}
610
build.appstudio.redhat.com/commit_sha: '{{revision}}'
711
build.appstudio.redhat.com/target_branch: '{{target_branch}}'

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ To quickly get hands on LCS, we can run it using the default configurations prov
188188
```
189189
4. access LCS web UI at [http://localhost:8080/](http://localhost:8080/)
190190

191-
**Note**: `make run` uses containerized llama-stack (service mode). To run llama-stack manually instead, see the [Llama Stack as separate server](#llama-stack-as-separate-server) section below.
191+
**Note**: `make run` uses containerized llama-stack (service mode). For details on container lifecycle management, customization, and troubleshooting, see the [Container Orchestration Guide](docs/container_orchestration.md). To run llama-stack manually instead, see the [Llama Stack as separate server](#llama-stack-as-separate-server) section below.
192192

193193
## Container Runtime Requirements
194194

@@ -199,6 +199,8 @@ The Makefile requires either Podman or Docker to launch the Llama Stack containe
199199

200200
The Makefile will auto-detect which runtime is available.
201201

202+
**For advanced usage** including customization options, cleanup commands, and troubleshooting, see the [Container Orchestration Guide](docs/container_orchestration.md).
203+
202204

203205
# Configuration
204206

docs/auth/rh-identity.md

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,13 @@ directly (e.g., Insights client, subscription-manager).
114114

115115
**Identity extraction:**
116116
- `user_id`: From `identity.system.cn` (certificate Common Name)
117-
- `username`: From `identity.account_number`
117+
- `username`: From `identity.account_number` when present and non-empty,
118+
otherwise falls back to `identity.system.cn`
119+
120+
`org_id` is the required organizational identifier for System identities.
121+
`account_number` is optional: no-cost RHEL developer subscriptions send an
122+
empty `account_number` with a populated `org_id`. A System identity is rejected
123+
only when `org_id` or `system.cn` is empty or absent.
118124

119125
**Header structure:**
120126
```json
@@ -134,6 +140,22 @@ directly (e.g., Insights client, subscription-manager).
134140
}
135141
```
136142

143+
A developer-subscription System identity omits the account number:
144+
```json
145+
{
146+
"identity": {
147+
"account_number": "",
148+
"org_id": "18939564",
149+
"type": "System",
150+
"auth_type": "cert-auth",
151+
"system": {
152+
"cn": "14b75b86-6f99-411d-b41d-f400268b5807",
153+
"cert_type": "system"
154+
}
155+
}
156+
}
157+
```
158+
137159
**Available System fields:**
138160

139161
| Field | Type | Description |
@@ -147,8 +169,8 @@ Both identity types share these top-level fields:
147169

148170
| Field | Type | Description |
149171
|-------|------|-------------|
150-
| `account_number` | string | Red Hat account number |
151-
| `org_id` | string | Organization ID |
172+
| `account_number` | string | Red Hat account number (optional for System identities; may be empty for developer subscriptions) |
173+
| `org_id` | string | Organization ID (required for System identities) |
152174
| `type` | string | Identity type: "User" or "System" |
153175

154176
## Entitlements
@@ -269,7 +291,7 @@ curl http://localhost:8080/v1/query \
269291
| 400 | Missing `username` in user | `{"detail": "Missing 'username' in user data"}` |
270292
| 400 | Missing `system` for System type | `{"detail": "Missing 'system' field for System type"}` |
271293
| 400 | Missing `cn` in system | `{"detail": "Missing 'cn' in system data"}` |
272-
| 400 | Missing `account_number` for System | `{"detail": "Missing 'account_number' for System type"}` |
294+
| 400 | Missing `org_id` for System | `{"detail": "Missing 'org_id' for System type"}` |
273295
| 400 | Unsupported identity type | `{"detail": "Unsupported identity type: X"}` |
274296
| 403 | Missing required entitlements | `{"detail": "Missing required entitlement: rhel"}` |
275297

0 commit comments

Comments
 (0)