Skip to content

Conversation

@nevermarine
Copy link
Collaborator

Description

update 3p versions for cve fixes (#1572)

Why do we need it, and what problem does it solve?

What is the expected result?

Checklist

  • The code is covered by unit tests.
  • e2e tests passed.
  • Documentation updated according to the changes.
  • Changes were tested in the Kubernetes cluster manually.

Changelog entries

Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
Signed-off-by: Isteb4k <dmitry.rakitin@flant.com>
Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>
Co-authored-by: Dmitry Rakitin <dmitry.rakitin@flant.com>
Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com>
Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
@sourcery-ai
Copy link
Contributor

sourcery-ai bot commented Oct 14, 2025

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

This PR updates third-party component versions to address CVEs and streamlines CI build scripts by consolidating git clone logic and removing manual module upgrades.

Flow diagram for streamlined git clone logic in CI build scripts

flowchart TD
  A["Start build script"] --> B["Read SOURCE_REPO secret"]
  B --> C["Construct git repo URL and branch/tag"]
  C --> D["git clone --depth=1 <repo_url> --branch <tag> /src/<repo>"]
  D --> E["Remove .git directory"]
  E --> F["Continue build steps"]
Loading

File-Level Changes

Change Details Files
Bump 3p component versions
  • Updated 3p-kubevirt to v1.3.1-v12n.17
  • Updated 3p-containerized-data-importer to v1.60.3-v12n.11
build/components/versions.yml
Refactor virt-artifact build script
  • Introduced $gitRepoUrl variable for cloning
  • Unified git clone command and removed .git directory post-clone
  • Removed explicit go get CVE patches in favor of go mod download and vendor
images/virt-artifact/werf.inc.yaml
Refactor cdi-artifact build script
  • Standardized git clone echo and syntax
  • Removed manual CVE module upgrades and go mod tidy
  • Retained go mod vendor and patch application
images/cdi-artifact/werf.inc.yaml
Update dvcr-artifact dependencies
  • Bumped github.com/docker/docker to v28.0.0
  • Upgraded github.com/ulikunitz/xz to v0.5.15
images/dvcr-artifact/go.mod
Update virtualization-artifact dependencies
  • Bumped github.com/docker/docker to v28.0.0
  • Added replace directive for kubevirt.io/api at v1.3.1-v12n.17
images/virtualization-artifact/go.mod

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey there - I've reviewed your changes - here's some feedback:

  • In images/virt-artifact/werf.inc.yaml you clone into /src/kubevirt but then cd into /kubevirt—please update the working directory path to match the clone target.
  • Consider extracting the common repo URL and clone logic into a shared variable or helper to reduce duplication across your werf.inc.yaml scripts.
  • After bumping module versions in virtualization-artifact, don’t forget to regenerate go.sum (e.g. via go mod tidy) so that the checksum file stays in sync with your updates.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- In images/virt-artifact/werf.inc.yaml you clone into /src/kubevirt but then cd into /kubevirt—please update the working directory path to match the clone target.
- Consider extracting the common repo URL and clone logic into a shared variable or helper to reduce duplication across your werf.inc.yaml scripts.
- After bumping module versions in virtualization-artifact, don’t forget to regenerate go.sum (e.g. via go mod tidy) so that the checksum file stays in sync with your updates.

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@nevermarine nevermarine changed the title chore(ci): update 3p versions for cve fixes (#1572) chore(ci): backport update 3p versions for cve fixes (#1572) Oct 14, 2025
Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
@universal-itengineer universal-itengineer added the validation/skip/doc_changes Skip doc changes validation label Oct 14, 2025
@nevermarine nevermarine merged commit d755db0 into release-1.1 Oct 14, 2025
47 of 51 checks passed
@nevermarine nevermarine deleted the chore/ci/cherry-pick-cves branch October 14, 2025 16:21
nevermarine added a commit that referenced this pull request Oct 15, 2025
Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
Signed-off-by: Isteb4k <dmitry.rakitin@flant.com>
Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>
Co-authored-by: Dmitry Rakitin <dmitry.rakitin@flant.com>
Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com>
Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
Isteb4k added a commit that referenced this pull request Oct 15, 2025
Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
Signed-off-by: Isteb4k <dmitry.rakitin@flant.com>
Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>
Co-authored-by: Dmitry Rakitin <dmitry.rakitin@flant.com>
Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com>
Signed-off-by: Isteb4k <dmitry.rakitin@flant.com>
nevermarine added a commit that referenced this pull request Oct 15, 2025
Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
Signed-off-by: Isteb4k <dmitry.rakitin@flant.com>
Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>
Co-authored-by: Dmitry Rakitin <dmitry.rakitin@flant.com>
Co-authored-by: Nikita Korolev <141920865+universal-itengineer@users.noreply.github.com>
Signed-off-by: Maksim Fedotov <maksim.fedotov@flant.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

validation/skip/doc_changes Skip doc changes validation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants