ROX-18384: removes the slim collector distinction by Stringy · Pull Request #13350 · stackrox/stackrox

Stringy · 2024-11-15T14:34:13Z

Description

Following the deprecation of slim Collector images in 4.5, this PR removes references to slim Collector, including:

helm charts
roxctl
operator
tests
removes use of -latest images in development builds
sets imagePullPolicy to IfNotPresent by default

Best endeavours have been made to ensure backwards/upgrade compatibility and manual testing of installation methods has verified that slim collector is no longer considered, but use of the imageFlavor or slimCollector parameters are ignored.

The storage of collector's image metadata (registry, tag, etc) has been simplified, and image flavor has been removed from UI and operator manifests.

User-facing documentation

CHANGELOG is updated OR update is not needed
documentation PR is created and is linked above OR is not needed

Testing and quality

the change is production ready: the change is GA or otherwise the functionality is gated by a feature flag
CI results are inspected

Automated testing

~~- [ ] added unit tests~~
~~- [ ] added e2e tests~~
~~- [ ] added regression tests~~
~~- [ ] added compatibility tests~~

modified existing tests

How I validated my change

Operator testing:

make install run from specific version (release, master), install central & secured cluster with slim Collector enabled
make install run from feature branch, awaiting the upgrade and confirming that upgrade has been successful and non-slim images are installed

Helm

installed from helm charts on earlier version (master) with slim Collector
upgraded, verifying correct non-slim Collector images

Manifest testing:

following install / upgrade docs from install and upgrade

Test Matrix

In all upgrade tests, slim collector is enabled on the older version and then upgraded. Images used are verified to not have the -slim suffix.

openshift-ci · 2024-11-15T14:34:16Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

rhacs-bot · 2024-11-15T15:07:13Z

Images are ready for the commit at e8b084d.

To use with deploy scripts, first export MAIN_IMAGE_TAG=4.7.x-631-ge8b084dfe1.

Stringy · 2024-12-04T15:25:19Z

/test all

Stringy · 2024-12-05T14:54:09Z

/test all

Stringy · 2024-12-17T14:54:56Z

/test all

Stringy · 2024-12-18T13:04:05Z

/test all

vikin91

How nice that we are getting rid of that :) This is a substantial change and the most important part here would be to test all installation methods. I remember that when we worked on the flavors, we had a matrix where we tested the following:

for op in (fresh-install, upgrade)
   for install-method in (manifests, helm, operator)
        deploy/upgrade ACS()

It would be great if we could test those here as well.

We should also not forget about:

Downstream changes in CPaaS (if needed) (in case we still plan to use it)
Manual upgrade instructions for customers who purely rely on generating manifests and kubectl apply -f - them.

In the meantime, I am queueing this for a proper review.

Stringy · 2024-12-19T11:07:17Z

It would be great if we could test those here as well.

Yeah absolutely. I intend to perform most of this testing in parallel to the reviews, as my initial testing of helm & operator upgrading between master and this branch has been largely successful. I'll keep track of results in the main PR description.

- warning in roxctl when slim-collector used - warning in helm when slimMode used - some commentary added for roxctl testing slim mode

Adjusts warnings for slim mode in roxctl and helm charts Co-authored-by: Piotr Rygielski <114479+vikin91@users.noreply.github.com> Co-authored-by: Moritz Clasmeier <111092021+mclasmeier@users.noreply.github.com>

vikin91

Approving, since the blocker-issue has been discussed and clarified.

Stringy · 2025-02-04T08:47:22Z

/retest

roxctl/sensor/generate/generate.go

Stringy · 2025-02-05T19:29:19Z

/retest

Stringy · 2025-02-05T19:30:53Z

Based on approvals from all teams (UI approval provided by Mark in #13350 (comment)) and test failures being flakes (re-running now) I'll set the pr to auto-merge once conversations are resolved.

openshift-ci · 2025-02-06T00:40:46Z

@Stringy: The following test 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/ocp-4-12-scanner-v4-install-tests	`e8b084d`	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.

tommartensen · 2025-02-10T12:53:45Z

This shouldn't be backported to 4.6 build on Konflux, it's a 4.7+ change. (no action required, just a reminder not to add the backport label)

All installation methods are updated to either ignore or translate the slim mode, so that regular images are used throughout. supporting code has been updated to reflect this, and duplicate variables for slim/full collector have been consolidated into single variable alternatives. Co-authored-by: Dmitrii Dolgov <9erthalion6@gmail.com> Co-authored-by: Piotr Rygielski <114479+vikin91@users.noreply.github.com> Co-authored-by: Moritz Clasmeier <111092021+mclasmeier@users.noreply.github.com>

openshift-ci bot added the do-not-merge/work-in-progress label Nov 15, 2024

github-actions bot added area/central area/helm area/sensor labels Nov 15, 2024

github-actions bot added the area/operator label Nov 18, 2024

Stringy force-pushed the giles/ROX-18384-remove-slim-collector branch from 37e0754 to 6070798 Compare December 4, 2024 12:05

github-actions bot added the area/roxctl label Dec 5, 2024

github-actions bot added the area/ui label Dec 6, 2024

Stringy force-pushed the giles/ROX-18384-remove-slim-collector branch 2 times, most recently from aeb400f to aed4252 Compare December 12, 2024 14:29

github-actions bot added the area/ci label Dec 16, 2024

Stringy force-pushed the giles/ROX-18384-remove-slim-collector branch 2 times, most recently from aed4252 to dac2457 Compare December 16, 2024 13:49

Stringy requested a review from a team December 18, 2024 13:01

Stringy marked this pull request as ready for review December 19, 2024 09:33

Stringy requested review from a team as code owners December 19, 2024 09:33

Stringy requested review from mclasmeier and removed request for a team December 19, 2024 09:33

openshift-ci bot removed the do-not-merge/work-in-progress label Dec 19, 2024

vikin91 reviewed Dec 19, 2024

View reviewed changes

Stringy and others added 3 commits February 3, 2025 16:22

Remove duplicated test cases

625ad98

PR adjustments

8e489e7

- warning in roxctl when slim-collector used - warning in helm when slimMode used - some commentary added for roxctl testing slim mode

Adds roxctl test for slim-collector flag

1943521

Adjusts warnings for slim mode in roxctl and helm charts Co-authored-by: Piotr Rygielski <114479+vikin91@users.noreply.github.com> Co-authored-by: Moritz Clasmeier <111092021+mclasmeier@users.noreply.github.com>

Stringy force-pushed the giles/ROX-18384-remove-slim-collector branch from 437f42f to 1943521 Compare February 3, 2025 17:09

vikin91 approved these changes Feb 3, 2025

View reviewed changes

janisz reviewed Feb 4, 2025

View reviewed changes

roxctl/sensor/generate/generate.go Outdated Show resolved Hide resolved

janisz approved these changes Feb 4, 2025

View reviewed changes

Stringy force-pushed the giles/ROX-18384-remove-slim-collector branch from fa37c5c to 4ddbe8f Compare February 4, 2025 12:14

Marks slim-collector as deprecated and updates central env warning

b3b550a

Stringy force-pushed the giles/ROX-18384-remove-slim-collector branch from 4ddbe8f to b3b550a Compare February 4, 2025 13:10

Stringy added 4 commits February 4, 2025 16:21

Remember to delete test cluster

fe44718

Add deprecation assertion for slim-collector

6158da7

Fix deprecation line assert

bee1413

Rename slimfull test file

e8b084d

Stringy enabled auto-merge (squash) February 5, 2025 19:32

Stringy merged commit d0bc804 into master Feb 6, 2025
78 checks passed

Stringy deleted the giles/ROX-18384-remove-slim-collector branch February 6, 2025 10:45

This was referenced Feb 7, 2025

ROX-18384: removes slim and latest images from konflux build stackrox/collector#2028

Merged

ROX-27612: Removes Collector slim references from tekton pipeline #14169

Merged

tommartensen added backport-for-4.6-konflux-release https://redhat-internal.slack.com/archives/C05TS9N0S7L/p1730134914487439 and removed backport-for-4.6-konflux-release https://redhat-internal.slack.com/archives/C05TS9N0S7L/p1730134914487439 labels Feb 10, 2025

Stringy mentioned this pull request Feb 10, 2025

chore(ci): Adds autolabeller config for konflux dockerfile changes #14193

Merged

msugakov mentioned this pull request Feb 11, 2025

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

Merged

janisz mentioned this pull request Jul 18, 2025

ROX-29994: Remove 3 roxctl options that have been deprecated #16066

Merged

9 tasks

Conversation

Stringy commented Nov 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

User-facing documentation

Testing and quality

Automated testing

How I validated my change

Test Matrix

Uh oh!

openshift-ci bot commented Nov 15, 2024

Uh oh!

rhacs-bot commented Nov 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Stringy commented Dec 4, 2024

Uh oh!

Stringy commented Dec 5, 2024

Uh oh!

Stringy commented Dec 17, 2024

Uh oh!

Stringy commented Dec 18, 2024

Uh oh!

vikin91 left a comment

Choose a reason for hiding this comment

Uh oh!

Stringy commented Dec 19, 2024

Uh oh!

vikin91 left a comment

Choose a reason for hiding this comment

Uh oh!

Stringy commented Feb 4, 2025

Uh oh!

Uh oh!

Stringy commented Feb 5, 2025

Uh oh!

Stringy commented Feb 5, 2025

Uh oh!

openshift-ci bot commented Feb 6, 2025

Uh oh!

Uh oh!

tommartensen commented Feb 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Stringy commented Nov 15, 2024 •

edited

Loading

rhacs-bot commented Nov 15, 2024 •

edited

Loading

tommartensen commented Feb 10, 2025 •

edited

Loading