Skip to content

sysdump: Use label selectors for Hubble UI/Relay deployment collection#44227

Merged
tklauser merged 1 commit intocilium:mainfrom
darox:add-sysdump-arg-hubble-deployment
Feb 10, 2026
Merged

sysdump: Use label selectors for Hubble UI/Relay deployment collection#44227
tklauser merged 1 commit intocilium:mainfrom
darox:add-sysdump-arg-hubble-deployment

Conversation

@darox
Copy link
Copy Markdown
Contributor

@darox darox commented Feb 6, 2026

Previously, sysdump collected Hubble UI and Hubble Relay deployments using hardcoded deployment names ('hubble-ui', 'hubble-relay'). This caused the collection to fail when users deployed Hubble components with custom names (e.g., 'hubble-ui-blue'), even when the correct labels were provided via --hubble-ui-labels or --hubble-relay-labels.

This change updates the deployment collection to use ListDeployment with the configured label selectors instead of GetDeployment with hardcoded names. This makes deployment collection consistent with pod log collection, which already uses label selectors.

Fixes the issue where:
cilium sysdump --hubble-ui-labels k8s-app=hubble-ui-blue
would still fail with 'Deployment hubble-ui not found'.

@darox darox requested a review from a team as a code owner February 6, 2026 13:37
@darox darox requested a review from tommyp1ckles February 6, 2026 13:37
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Feb 6, 2026
@github-actions github-actions bot added cilium-cli This PR contains changes related with cilium-cli cilium-cli-exclusive This PR only impacts cilium-cli binary labels Feb 6, 2026
Copy link
Copy Markdown
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something looks off with the PR branch, there is a merge commit. Could you please rebase on top of latest main and drop the merge commit?

Also, the hubbleUIDeploymentName and hubbleUIDeploymentName constants are unused now and should be removed.

@tklauser tklauser added the release-note/misc This PR makes changes that have no direct user impact. label Feb 10, 2026
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Feb 10, 2026
@darox darox force-pushed the add-sysdump-arg-hubble-deployment branch from 5c15257 to bb8645e Compare February 10, 2026 10:04
Previously, sysdump collected Hubble UI and Hubble Relay deployments
using hardcoded deployment names ('hubble-ui', 'hubble-relay'). This
caused the collection to fail when users deployed Hubble components
with custom names (e.g., 'hubble-ui-blue'), even when the correct
labels were provided via --hubble-ui-labels or --hubble-relay-labels.

This change updates the deployment collection to use ListDeployment
with the configured label selectors instead of GetDeployment with
hardcoded names. This makes deployment collection consistent with
pod log collection, which already uses label selectors.

Fixes the issue where:
  cilium sysdump --hubble-ui-labels k8s-app=hubble-ui-blue
would still fail with 'Deployment hubble-ui not found'.

Signed-off-by: darox <maderdario@gmail.com>
@darox darox force-pushed the add-sysdump-arg-hubble-deployment branch from bb8645e to db0e9c4 Compare February 10, 2026 10:19
@tklauser
Copy link
Copy Markdown
Member

tklauser commented Feb 10, 2026

Something looks off with the PR branch, there is a merge commit. Could you please rebase on top of latest main and drop the merge commit?
Also, the hubbleUIDeploymentName and hubbleUIDeploymentName constants are unused now and should be removed.

If we remvoe the constants it will break the status command see screenshot:

Only the local constants I mentioned in my message should be removed, not the ones in the defaults package.

@tklauser
Copy link
Copy Markdown
Member

/test

@tklauser tklauser enabled auto-merge February 10, 2026 10:30
@darox
Copy link
Copy Markdown
Contributor Author

darox commented Feb 10, 2026

Something looks off with the PR branch, there is a merge commit. Could you please rebase on top of latest main and drop the merge commit?
Also, the hubbleUIDeploymentName and hubbleUIDeploymentName constants are unused now and should be removed.

If we remvoe the constants it will break the status command see screenshot:

Only the local constants I mentioned in my message should be removed, not the ones in the defaults package.

Yeah. I noticed that so I deleted the comment. Sorry for the confusion.

@tklauser tklauser added this pull request to the merge queue Feb 10, 2026
Merged via the queue into cilium:main with commit 10a0dce Feb 10, 2026
76 checks passed
lambchop4prez added a commit to lambchop4prez/network that referenced this pull request Feb 26, 2026
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
|
[aqua:cilium/cilium-cli](https://redirect.github.com/cilium/cilium-cli)
| patch | `0.19.0` → `0.19.2` |

---

### Release Notes

<details>
<summary>cilium/cilium-cli (aqua:cilium/cilium-cli)</summary>

###
[`v0.19.2`](https://redirect.github.com/cilium/cilium-cli/compare/v0.19.1...v0.19.2)

[Compare
Source](https://redirect.github.com/cilium/cilium-cli/compare/v0.19.1...v0.19.2)

###
[`v0.19.1`](https://redirect.github.com/cilium/cilium-cli/releases/tag/v0.19.1)

[Compare
Source](https://redirect.github.com/cilium/cilium-cli/compare/v0.19.0...v0.19.1)

## Summary of Changes

**Minor Changes:**

- cli: clustermesh: use ca bundle to connect clusters
([cilium/cilium#42833](https://redirect.github.com/cilium/cilium/issues/42833),
[@&#8203;MrFreezeex](https://redirect.github.com/MrFreezeex))

**Bugfixes:**

- cilium-cli: Fix NodePort deployment check in dual-stack clusters
([cilium/cilium#43888](https://redirect.github.com/cilium/cilium/issues/43888),
[@&#8203;gandro](https://redirect.github.com/gandro))
- Fix GKE conformance test NodePort timeouts by skipping unreachable
external IP validation on GKE
([cilium/cilium#44014](https://redirect.github.com/cilium/cilium/issues/44014),
[@&#8203;pillai-ashwin](https://redirect.github.com/pillai-ashwin))

**CI Changes:**

- cli: Relax warning exclusion for "unable to find key in local cache"
([cilium/cilium#44149](https://redirect.github.com/cilium/cilium/issues/44149),
[@&#8203;brb](https://redirect.github.com/brb))

**Misc Changes:**

- chore(deps): update all-dependencies (main)
([cilium/cilium#43700](https://redirect.github.com/cilium/cilium/issues/43700),
[@&#8203;cilium-renovate](https://redirect.github.com/cilium-renovate)\[bot])
- chore(deps): update all-dependencies (main)
([cilium/cilium#43824](https://redirect.github.com/cilium/cilium/issues/43824),
[@&#8203;cilium-renovate](https://redirect.github.com/cilium-renovate)\[bot])
- chore(deps): update all-dependencies (main)
([cilium/cilium#43965](https://redirect.github.com/cilium/cilium/issues/43965),
[@&#8203;cilium-renovate](https://redirect.github.com/cilium-renovate)\[bot])
- chore(deps): update all-dependencies (main)
([cilium/cilium#44090](https://redirect.github.com/cilium/cilium/issues/44090),
[@&#8203;cilium-renovate](https://redirect.github.com/cilium-renovate)\[bot])
- chore(deps): update all-dependencies (main)
([cilium/cilium#44235](https://redirect.github.com/cilium/cilium/issues/44235),
[@&#8203;cilium-renovate](https://redirect.github.com/cilium-renovate)\[bot])
- chore(deps): update base-images (main)
([cilium/cilium#43827](https://redirect.github.com/cilium/cilium/issues/43827),
[@&#8203;cilium-renovate](https://redirect.github.com/cilium-renovate)\[bot])
- chore(deps): update base-images (main)
([cilium/cilium#43969](https://redirect.github.com/cilium/cilium/issues/43969),
[@&#8203;cilium-renovate](https://redirect.github.com/cilium-renovate)\[bot])
- chore(deps): update base-images (main)
([cilium/cilium#44239](https://redirect.github.com/cilium/cilium/issues/44239),
[@&#8203;cilium-renovate](https://redirect.github.com/cilium-renovate)\[bot])
- cilium-cli: Fix container name in connectivity test logs
([cilium/cilium#44076](https://redirect.github.com/cilium/cilium/issues/44076),
[@&#8203;HadrienPatte](https://redirect.github.com/HadrienPatte))
- docs: fix typos in comments
([cilium/cilium#43821](https://redirect.github.com/cilium/cilium/issues/43821),
[@&#8203;NAM-MAN](https://redirect.github.com/NAM-MAN))
- feat(cilium-cli): Add -r(estart) parameter to cilium upgrade
([cilium/cilium#43722](https://redirect.github.com/cilium/cilium/issues/43722),
[@&#8203;alagoutte](https://redirect.github.com/alagoutte))
- Introduce end-to-end tests for Cilium's ZTunnel integration.
([cilium/cilium#43166](https://redirect.github.com/cilium/cilium/issues/43166),
[@&#8203;ldelossa](https://redirect.github.com/ldelossa))
- Replace Index{,Byte} with Cut,Contains
([cilium/cilium#43708](https://redirect.github.com/cilium/cilium/issues/43708),
[@&#8203;joestringer](https://redirect.github.com/joestringer))
- sysdump: Use label selectors for Hubble UI/Relay deployment collection
([cilium/cilium#44227](https://redirect.github.com/cilium/cilium/issues/44227),
[@&#8203;darox](https://redirect.github.com/darox))
- chore(deps): update dependency cilium/cilium to v1.18.6 by
[@&#8203;renovate](https://redirect.github.com/renovate)\[bot] in
[#&#8203;3168](https://redirect.github.com/cilium/cilium-cli/pull/3168)
- Update stable release to v0.19.0 by
[@&#8203;tklauser](https://redirect.github.com/tklauser) in
[#&#8203;3169](https://redirect.github.com/cilium/cilium-cli/pull/3169)
- chore(deps): update go to v1.25.6 by
[@&#8203;renovate](https://redirect.github.com/renovate)\[bot] in
[#&#8203;3170](https://redirect.github.com/cilium/cilium-cli/pull/3170)
- chore(deps): update docker.io/library/golang:1.25.6 docker digest to
[`ce63a16`](https://redirect.github.com/cilium/cilium-cli/commit/ce63a16)
by [@&#8203;renovate](https://redirect.github.com/renovate)\[bot] in
[#&#8203;3172](https://redirect.github.com/cilium/cilium-cli/pull/3172)
- chore(deps): update actions/checkout action to v6.0.2 by
[@&#8203;renovate](https://redirect.github.com/renovate)\[bot] in
[#&#8203;3171](https://redirect.github.com/cilium/cilium-cli/pull/3171)
- ci: Harden the image build process by
[@&#8203;ferozsalam](https://redirect.github.com/ferozsalam) in
[#&#8203;3174](https://redirect.github.com/cilium/cilium-cli/pull/3174)
- chore(deps): update gcr.io/distroless/static:latest docker digest to
[`972618c`](https://redirect.github.com/cilium/cilium-cli/commit/972618c)
by [@&#8203;renovate](https://redirect.github.com/renovate)\[bot] in
[#&#8203;3176](https://redirect.github.com/cilium/cilium-cli/pull/3176)
- chore(deps): update all github action dependencies by
[@&#8203;renovate](https://redirect.github.com/renovate)\[bot] in
[#&#8203;3175](https://redirect.github.com/cilium/cilium-cli/pull/3175)
- chore(deps): update go to v1.25.7 by
[@&#8203;renovate](https://redirect.github.com/renovate)\[bot] in
[#&#8203;3178](https://redirect.github.com/cilium/cilium-cli/pull/3178)
- chore(deps): update golangci/golangci-lint docker tag to v2.9.0 by
[@&#8203;renovate](https://redirect.github.com/renovate)\[bot] in
[#&#8203;3179](https://redirect.github.com/cilium/cilium-cli/pull/3179)
- chore(deps): update go to v1.26.0 by
[@&#8203;renovate](https://redirect.github.com/renovate)\[bot] in
[#&#8203;3181](https://redirect.github.com/cilium/cilium-cli/pull/3181)
- chore(deps): update docker/build-push-action action to v6.19.0 by
[@&#8203;renovate](https://redirect.github.com/renovate)\[bot] in
[#&#8203;3180](https://redirect.github.com/cilium/cilium-cli/pull/3180)
- chore(deps): update docker/build-push-action action to v6.19.2 by
[@&#8203;renovate](https://redirect.github.com/renovate)\[bot] in
[#&#8203;3183](https://redirect.github.com/cilium/cilium-cli/pull/3183)
- Prepare for v0.19.1 release by
[@&#8203;tklauser](https://redirect.github.com/tklauser) in
[#&#8203;3184](https://redirect.github.com/cilium/cilium-cli/pull/3184)

#### New Contributors

- [@&#8203;ferozsalam](https://redirect.github.com/ferozsalam) made
their first contribution in
[#&#8203;3174](https://redirect.github.com/cilium/cilium-cli/pull/3174)

**Full Changelog**:
<cilium/cilium-cli@v0.19.0...v0.19.1>

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/lambchop4prez/network).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My44LjUiLCJ1cGRhdGVkSW5WZXIiOiI0My4zNi4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJyZW5vdmF0ZS9naXRodWItcmVsZWFzZXMiLCJ0eXBlL3BhdGNoIl19-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cilium-cli This PR contains changes related with cilium-cli cilium-cli-exclusive This PR only impacts cilium-cli binary release-note/misc This PR makes changes that have no direct user impact.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants