Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ROX-20232: Remove all but single collector pipeline #1687

Merged
merged 7 commits into from
May 29, 2024

Conversation

msugakov
Copy link
Contributor

@msugakov msugakov commented May 23, 2024

Description

This follows up on #1676 applying the approach from stackrox/scanner#1526.

Also follows up on #1684 cleaning slim stage in Dockerfile and removing slim pipelines.

I use apply-tags task to ensure both -latest and -slim suffixes are provided. I use it to resolve ROX-24116 too.

The only thing I worry here is that we'll have a dangling collector-slim Konflux component and I wonder if it will cause any trouble. At some point, we'll just kill it.

I suggest to review this PR by commits because I tried splitting changes and provided brief messages.

Checklist

  • Investigated and inspected CI test results

These aren't relevant and won't be done:

  • Updated documentation accordingly
  • Added unit tests
  • Added integration tests
  • Added regression tests

Testing Performed

  • Checked output images by tags.

All these exist and point to the same image:

  1. quay.io/rhacs-eng/collector:3.18.x-264-ga99ac1e8c3-fast
  2. quay.io/rhacs-eng/collector:3.18.x-264-ga99ac1e8c3-fast-slim
  3. quay.io/rhacs-eng/collector:3.18.x-264-ga99ac1e8c3-fast-latest
  4. quay.io/rhacs-eng/collector:konflux-a99ac1e8c3cc2e19d2714aac0ee4dd5523be2dc4

@msugakov msugakov force-pushed the misha/ROX-20232-groom-collector-konflux-further branch from 240dd82 to f630740 Compare May 23, 2024 17:25
@msugakov msugakov changed the title Remove all but single collector pipeline ROX-20232: Remove all but single collector pipeline May 23, 2024
@msugakov msugakov marked this pull request as ready for review May 23, 2024 18:50
@msugakov msugakov requested review from a team as code owners May 23, 2024 18:50
value: $(tasks.build-container.results.IMAGE_URL)
- name: ADDITIONAL_TAGS
value:
- $(tasks.determine-image-tag.results.image-tag)-latest
Copy link
Contributor

Choose a reason for hiding this comment

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

When (if at all) will the -latest and -slim tags be removed? Can we link a Jira issue here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So far, it's a distant plan for which I created the epic ROX-24402.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for updating the comment.

@tommartensen
Copy link
Contributor

The only thing I worry here is that we'll have a dangling collector-slim Konflux component and I wonder if it will cause any trouble. At some point, we'll just kill it.

It won't build anymore, but will cause trouble in the enterprise contract runs (outdated task definitions), because it is part of every snapshot. I suggest to remove it now.

@msugakov
Copy link
Contributor Author

I suggest to remove it now.

Ok, will remove after I merge this and after I back up components.

@msugakov msugakov requested a review from Molter73 May 29, 2024 09:19
@msugakov msugakov merged commit bdf4b26 into master May 29, 2024
54 of 55 checks passed
@msugakov msugakov deleted the misha/ROX-20232-groom-collector-konflux-further branch May 29, 2024 09:26
msugakov added a commit to stackrox/rhtap-data that referenced this pull request May 31, 2024
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