Skip to content

fix(prometheus): Avoid appending duplicate pods - #123

Merged
LeaveMyYard merged 1 commit into
robusta-dev:mainfrom
baprx:fix/avoid-duplicate-pods
Aug 10, 2023
Merged

LeaveMyYard merged 1 commit into
robusta-dev:mainfrom
baprx:fix/avoid-duplicate-pods

Conversation

@baprx

@baprx baprx commented Aug 4, 2023

Copy link
Copy Markdown

Hi, I noticed an incorrect pod count that causes incorrect results. I fixed the issue in this PR by simply converting the pod list to a set.

Here's my results before and after the fix:

❯ yq '.scans | map(select(.object.name == "node-exporter")) | .[0].object.pods | map(select(.deleted == false)) | length' before.yml
27
❯ yq '.scans | map(select(.object.name == "node-exporter")) | .[0].object.pods | map(select(.deleted == false)) | length' after.yml
8
❯ kubectl -n monitoring get pods | grep node-exporter | wc -l
8

Without filtering out deleted pods:

❯ yq '.scans | map(select(.object.name == "node-exporter")) | .[0].object.pods | length' before.yml
153
❯ yq '.scans | map(select(.object.name == "node-exporter")) | .[0].object.pods | length' after.yml
42

@CLAassistant

CLAassistant commented Aug 4, 2023 •

Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

@LeaveMyYard
LeaveMyYard merged commit ea01100 into robusta-dev:main Aug 10, 2023
@baprx
baprx deleted the fix/avoid-duplicate-pods branch August 10, 2023 11:56
Sheeproid added a commit that referenced this pull request Oct 19, 2026
#556)

## Summary
- **urllib3** 2.7.0 → 2.8.0 in `pyproject.toml`, `poetry.lock`,
`requirements.txt` and `enforcer/requirements.txt`. Fixes CVE-2026-97687
and CVE-2026-97689 (High). Closes dependabot alerts #122, #123, #125,
#126, #128 and #129, and the matching Artifact Registry findings on
`devel/krr`.
- **Dockerfile**: pip is uninstalled once the requirements are
installed. pip 26.2.1, the latest release, vendors its own urllib3
2.7.0, so the dependency bump alone left the CVEs in the image. krr
never calls pip at runtime. The pip upgrade, requirements install and
uninstall run in one `RUN`, so the upgraded pip never lands in an image
layer (CodeRabbit's finding, now fixed).

Linear: [ROB-1636](https://linear.app/robusta/issue/ROB-1636)

## Verification
- `poetry lock --no-update` with Poetry 1.8.5: only urllib3 changes in
the lock. `poetry check --lock` passes.
- `pytest`: 55 passed.
- Built the image for `linux/amd64` and scanned it with Trivy (Docker
Scout isn't available in the sandbox). The Python packages have no HIGH
or CRITICAL findings. Before this change the image showed urllib3 2.7.0
(pip's vendored copy) and msgpack 1.1.2. `docker history` shows no
separate pip layer.
- Built for `linux/arm64` under QEMU (from the commit before the
single-`RUN` change, so the same packages): it runs on `aarch64`, Trivy
reports the same results as amd64, urllib3 is 2.8.0, and pip is gone.
- In both images `krr.py simple --help` works.
- Not tested: a rescan in Artifact Registry. The Vanta finding clears
only after CI publishes the image.

Out of scope:
- `gcc-14` CVE-2026-95619 (Low, no Debian fix) and 10 unfixed Debian
HIGHs, unchanged from `main`.
- The `enforcer` image installs pip the same way, but Vanta has not
flagged it.
- The enforcer README's "Python 3.9+" was already wrong before this PR.
It's tracked in [ROB-1650](https://linear.app/robusta/issue/ROB-1650).

---
_Generated by [Claude
Code](https://claude.ai/code/session_01Fq7hqRqj2kshg8M2sFpN7h)_

---------

Signed-off-by: Claude <noreply@anthropic.com>
Co-authored-by: Claude <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants