Skip to content

chore(collector): Bump Collector version to 3.21.0#14188

Merged
Stringy merged 4 commits intomasterfrom
giles/update-collector-3.21
Feb 11, 2025
Merged

chore(collector): Bump Collector version to 3.21.0#14188
Stringy merged 4 commits intomasterfrom
giles/update-collector-3.21

Conversation

@Stringy
Copy link
Contributor

@Stringy Stringy commented Feb 10, 2025

Description

Bumps the Collector version to 3.21.0 in time for the release.

How I validated my change

Tests passing in Collector repo, and on latest CI on master. Otherwise CI in this PR will be enough.

@Stringy Stringy requested a review from a team February 10, 2025 09:13
@github-actions github-actions bot added the ci-all-qa-tests Tells CI to run all API tests (not just BAT). label Feb 10, 2025
@Stringy
Copy link
Contributor Author

Stringy commented Feb 11, 2025

/retest

@Stringy Stringy force-pushed the giles/update-collector-3.21 branch from 3fb4b45 to 5fd12f2 Compare February 11, 2025 10:00
@rhacs-bot
Copy link
Contributor

rhacs-bot commented Feb 11, 2025 •
edited
Loading

Images are ready for the commit at a0240db.

To use with deploy scripts, first export MAIN_IMAGE_TAG=4.7.x-709-ga0240db21b.

msugakov
msugakov reviewed Feb 11, 2025
View reviewed changes
@msugakov msugakov added the scan-images-with-roxctl Tells `scan-images-with-roxctl` job to run label Feb 11, 2025
msugakov
msugakov approved these changes Feb 11, 2025
View reviewed changes
Copy link
Contributor

@msugakov msugakov left a comment •
edited
Loading

Choose a reason for hiding this comment

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

This follows up #13350

LGTM for the changes here. I added one label so that roxctl scan gets really triggered to make sure it does not blow up too early.

I'd suggest you try further grep the repo for collector-slim occurrences (and maybe just -slim) to make sure nothing's left. In a separate PR will be fine.

@Stringy @msugakov
Fix whitespace in amd64_image_set
a0240db 
Co-authored-by: Misha Sugakov <537715+msugakov@users.noreply.github.com>
@Stringy
Copy link
Contributor Author

Stringy commented Feb 11, 2025

I'd suggest you try further grep the repo for collector-slim occurrences (and maybe just -slim) to make sure nothing's left. In a separate PR will be fine.

I did find one last reference in the release scripts #14213 and a small thing in Sensor (here) though I'm not sure there's any harm in the Sensor part.

Everything else is either testing that slim mode is translated/ignored correctly, or related to scanner-slim instead.

Molter73
Molter73 approved these changes Feb 11, 2025
View reviewed changes
Copy link
Contributor

@Molter73 Molter73 left a comment

Choose a reason for hiding this comment

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

LGTM!

@codecov
Copy link

codecov bot commented Feb 11, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 49.06%. Comparing base (4531d07) to head (a0240db).
Report is 6 commits behind head on master.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master   #14188   +/-   ##
=======================================
  Coverage   49.06%   49.06%           
=======================================
  Files        2515     2515           
  Lines      182745   182745           
=======================================
+ Hits        89655    89658    +3     
+ Misses      85970    85968    -2     
+ Partials     7120     7119    -1
Flag Coverage Δ
go-unit-tests 49.06% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@openshift-ci
Copy link

openshift-ci bot commented Feb 11, 2025 •
edited
Loading

@Stringy: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/gke-scanner-v4-install-tests a0240db link false /test gke-scanner-v4-install-tests
ci/prow/ocp-4-17-scanner-v4-install-tests a0240db link false /test ocp-4-17-scanner-v4-install-tests
ci/prow/ocp-4-12-scanner-v4-install-tests a0240db link false /test ocp-4-12-scanner-v4-install-tests

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@Stringy
Copy link
Contributor Author

Stringy commented Feb 11, 2025

With the failed tests relating to scanner install (and v4 upgrades), and seem to be flaky elsewhere, I'll merge this now.

@Stringy Stringy merged commit 20dcb50 into master Feb 11, 2025
112 of 115 checks passed
@Stringy Stringy deleted the giles/update-collector-3.21 branch February 11, 2025 15:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@msugakov msugakov msugakov approved these changes

@Molter73 Molter73 Molter73 approved these changes

Assignees

No one assigned

Labels

area/ci ci-all-qa-tests Tells CI to run all API tests (not just BAT). scan-images-with-roxctl Tells `scan-images-with-roxctl` job to run

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Stringy @rhacs-bot @msugakov @Molter73