Skip to content

Commit 646fb9b

Browse files
ricardoantoniocmricardoantoniocm
committed
Merge branch 'develop' into 'fb-fit-137/text-area-in-content-moderation-template-not-optimized-for-dark-mode'
Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/15214529094
2 parents 69510fc + 5368279 commit 646fb9b

File tree

84 files changed

+4293
-828
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+4293
-828
lines changed

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ web/libs/editor/**/Video* @HumanSignal/fine-tuners
1616
web/libs/editor/**/TimeSeries* @HumanSignal/fine-tuners
1717
web/apps/labelstudio/src/pages/DataManager @HumanSignal/fine-tuners
1818
label_studio/data_manager @HumanSignal/fine-tuners
19-
web/apps/playground @HumanSignal/fine-tuners
19+
web/apps/playground @HumanSignal/fine-tuners
20+
label_studio/**/migrations/*.py @HumanSignal/team-root

‎.github/workflows/follow-merge-dispatch.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request_target:
55
types:
66
- opened
7+
- closed
78
- converted_to_draft
89
- ready_for_review
910
- synchronize

‎docs/source/guide/install_enterprise_k8s.md‎

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ Adjust the included defaults to reflect your environment and copy these into a n
259259

260260
</div>
261261

262-
## Optional: set up TLS for PostgreSQL
262+
## Optional: Set up TLS for PostgreSQL
263263
To configure Label Studio Enterprise to use TLS for end-client connections with PostgreSQL, do the following:
264264

265265
1. Enable TLS for your PostgreSQL instance and save Root TLS certificate, client certificate and its key for the next steps.
@@ -286,7 +286,7 @@ global:
286286

287287
4. Install or upgrade Label Studio Enterprise using Helm.
288288

289-
## Optional: set up TLS for Redis
289+
## Optional: Set up TLS for Redis
290290
To configure Label Studio Enterprise to use TLS for end-client connections with Redis, do the following:
291291

292292
1. Enable TLS for your Redis instance and save Root TLS certificate, client certificate and its key for the next steps.
@@ -313,6 +313,51 @@ global:
313313

314314
4. Install or upgrade Label Studio Enterprise using Helm.
315315

316+
317+
## Optional: Set up username and password for Redis
318+
319+
Use one of these options to set a password and a username for Redis:
320+
321+
**1. Password via Kubernetes Secret**. Use this when:
322+
* You want to avoid embedding credentials in `values.yaml`
323+
* You already manage Secrets in your cluster
324+
* You need a simple auth without multiple Redis users and you don't have username
325+
326+
```yaml
327+
global:
328+
redisConfig:
329+
host: "redis://redis.example.com:6379/1"
330+
password:
331+
secretName: "my-redis-secret" # Kubernetes Secret name
332+
secretKey: "redis-password" # Key inside Secret
333+
```
334+
335+
**2. Username + password in URL**. Use this when:
336+
* Redis v.7 or later, and with ACL-enabled users
337+
* You need a dedicated Redis user for permission scoping
338+
* You need a quick, throwaway setup or local testing
339+
340+
```yaml
341+
global:
342+
redisConfig:
343+
host: "redis://myuser:[email protected]:6379/1"
344+
```
345+
346+
**3. Username in environment variables + password in secret**. Use this when:
347+
* Redis v.7 or later, and with ACL-enabled users
348+
* You want to keep the password secret but still specify a username
349+
350+
```yaml
351+
global:
352+
redisConfig:
353+
host: "redis://redis.example.com:6379/1"
354+
password:
355+
secretName: "my-redis-secret" # Kubernetes Secret name
356+
secretKey: "redis-password" # Key inside Secret
357+
extraEnvironmentVars:
358+
REDIS_USERNAME: "myuser" # Injected into pod env
359+
```
360+
316361
## Use Helm to install Label Studio Enterprise on your Kubernetes cluster
317362

318363
Use Helm to install Label Studio Enterprise on your Kubernetes cluster. Provide your custom resource definitions YAML file. Specify any environment variables that you need to set for your Label Studio Enterprise installation using the `--set` argument with the `helm install` command.

‎docs/source/guide/release_notes/onprem/2.24.0.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ Click your avatar in the upper right to find the toggle for dark mode.
2222
- **Light** - Use light mode.
2323
- **Dark** - Use dark mode.
2424

25+
!!! note
26+
Dark mode is not available for environments that use white labeling.
27+
2528
![Screenshot of dark mode](/images/releases/2-24-dark-mode.png)
2629

2730
![Animated gif of dark mode](/images/releases/2-24-darkmode.gif)

0 commit comments

Comments
 (0)