[PR #14] [MERGED] fix: ensure label consistency between backend types #46

New issue

Closed

opened 2026-10-18 21:13:46 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-18 21:13:46 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/open-webui/terminals/pull/14
Author: @james-westbrook
Created: 3/29/2026
Status: ✅ Merged
Merged: 3/29/2026
Merged by: @tjbck

Base: main ← Head: fix-label-consistency

📝 Commits (1)

fd3ca8b fix: ensure label consistency between backend types and across user-specific resources

📊 Changes

1 file changed (+23 additions, -15 deletions)

View changed files

📝 operator/handler.py (+23 -15)

📄 Description

Description

Fixes label inconsistency between backends & adds user-id labels to operator resources.

Problem

The kubernetes-operator backend used a different managed-by label value than every other backend:

Backend	`app.kubernetes.io/managed-by`
`kubernetes`	`terminals`
`docker`	`terminals`
`kubernetes-operator` (CRs)	`terminals`
operator child resources (pods, services, secrets, PVCs)	`open-terminal-operator` ← mismatch

This meant cross-backend queries filtered on managed-by=terminals would miss operator-created pods.

Additionally, operator-created resources were missing two useful labels:

app.kubernetes.io/part-of — not set at all
openwebui.com/user-id — present on resources from other backends but absent from operator-created ones

Root Cause

The operator's _labels() helper in handler.py hard-coded managed-by: open-terminal-operator and had no access to the user ID from the Terminal CR spec.

Fix

operator/handler.py

Changed managed-by from open-terminal-operator to terminals to align with all other backends.
Added part-of: open-terminal label.
Added optional user_id parameter to _labels() — when provided, emits openwebui.com/user-id on every child resource (pod, service, secret, PVC).
Threaded user_id from the Terminal CR spec through all four _build_*_manifest() functions and their call sites in on_create().
Updated the pod-watcher event filter from managed-by=open-terminal-operator to managed-by=terminals.

Contributor License Agreement

By submitting this pull request, I confirm that I have read and fully agree to the Contributor License Agreement (CLA), and I am providing my contributions under its terms.

Note

Deleting the CLA section will lead to immediate closure of your PR and it will not be merged in.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/open-webui/terminals/pull/14 **Author:** [@james-westbrook](https://github.com/james-westbrook) **Created:** 3/29/2026 **Status:** ✅ Merged **Merged:** 3/29/2026 **Merged by:** [@tjbck](https://github.com/tjbck) **Base:** `main` ← **Head:** `fix-label-consistency` --- ### 📝 Commits (1) - [`fd3ca8b`](https://github.com/open-webui/terminals/commit/fd3ca8b01bcdf6e1ed28ce0c4e58180ab7514b26) fix: ensure label consistency between backend types and across user-specific resources ### 📊 Changes **1 file changed** (+23 additions, -15 deletions) <details> <summary>View changed files</summary> 📝 `operator/handler.py` (+23 -15) </details> ### 📄 Description ## Description Fixes label inconsistency between backends & adds user-id labels to operator resources. ## Problem The `kubernetes-operator` backend used a different `managed-by` label value than every other backend: | Backend | `app.kubernetes.io/managed-by` | |---|---| | `kubernetes` | `terminals` | | `docker` | `terminals` | | `kubernetes-operator` (CRs) | `terminals` | | **operator child resources** (pods, services, secrets, PVCs) | **`open-terminal-operator`** ← mismatch | This meant cross-backend queries filtered on `managed-by=terminals` would miss operator-created pods. Additionally, operator-created resources were missing two useful labels: - `app.kubernetes.io/part-of` — not set at all - `openwebui.com/user-id` — present on resources from other backends but absent from operator-created ones ## Root Cause The operator's `_labels()` helper in `handler.py` hard-coded `managed-by: open-terminal-operator` and had no access to the user ID from the Terminal CR spec. ## Fix **`operator/handler.py`** 1. Changed `managed-by` from `open-terminal-operator` to `terminals` to align with all other backends. 2. Added `part-of: open-terminal` label. 3. Added optional `user_id` parameter to `_labels()` — when provided, emits `openwebui.com/user-id` on every child resource (pod, service, secret, PVC). 4. Threaded `user_id` from the Terminal CR spec through all four `_build_*_manifest()` functions and their call sites in `on_create()`. 5. Updated the pod-watcher event filter from `managed-by=open-terminal-operator` to `managed-by=terminals`. ## Related Issues  --- ## Contributor License Agreement  - [x] By submitting this pull request, I confirm that I have read and fully agree to the [Contributor License Agreement (CLA)](./CLA.md), and I am providing my contributions under its terms. > [!NOTE] > Deleting the CLA section will lead to immediate closure of your PR and it will not be merged in. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

bsakaguchi

2026-10-18 21:13:46 +00:00