Skip to content

istio: Remove Multus settings from the default Istio config #1422

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

ormergi
Copy link
Contributor

@ormergi ormergi commented Apr 9, 2025

What this PR does / why we need it:
Following recent Istio bump a regression has been introduced in CDI+Istio lane
https://prow.ci.kubevirt.io/view/gs/kubevirt-prow/pr-logs/pull/kubevirt_containerized-data-importer/3694/pull-containerized-data-importer-e2e-istio/1909911853820022784

The default Istio config 'istio-operator.cr.yaml' is intended to be used when Multus is not installed in the cluster.
Multus depends on the NetworkAttachmentDefinition CRD to be installed.

Currently the default Istio config is invalid, because it specify setting that installs the istio-cni NetworkAttachmentDefinition CR, where it should be used when no Multus is installed. For setups that have Multus installed, the 'istio-operator-with-cnao.cr.yaml' config should be used.

Remove Multus related settings from the default Istio config.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Checklist

This checklist is not enforcing, but it's a reminder of items that could be relevant to every PR.
Approvers are expected to review this list.

Release note:


The default Istio config 'istio-operator.cr.yaml' is intended to be used
when Multus is not installed in the cluster.
Multus depends on the NetworkAttachmentDefinition CRD to be installed.

Currently the default Istio config is invalid, because it specify
setting that installs the istio-cni NetworkAttachmentDefinition CR,
where it should be used when no Multus is installed.
For setups that have Multus installed, the
'istio-operator-with-cnao.cr.yaml' should be used.

Remove Multus related settings from the default Istio config.

Signed-off-by: Or Mergi <[email protected]>
@kubevirt-bot kubevirt-bot added the dco-signoff: yes Indicates the PR's author has DCO signed all their commits. label Apr 9, 2025
Copy link

sourcery-ai bot commented Apr 9, 2025

Reviewer's Guide by Sourcery

This pull request removes Multus-related configurations from the default Istio operator configuration file (istio-operator.cr.yaml). This change addresses a regression introduced after an Istio update, where the default Istio config was incorrectly including settings for Multus, making it invalid when Multus is not installed. By removing these settings, the default config is now suitable for environments without Multus.

No diagrams generated as the changes look simple and do not need a visual representation.

File-Level Changes

Change Details Files
Removed Multus-specific settings from the default Istio configuration.
  • Removed the provider: multus setting under spec.cni.
cluster-provision/gocli/opts/istio/manifests/istio-operator.cr.yaml

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!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

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

@kubevirt-bot kubevirt-bot requested review from dhiller and oshoval April 9, 2025 13:00
@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign stu-gott for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link

@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 @ormergi - I've reviewed your changes - here's some feedback:

Overall Comments:

  • Consider adding a comment in the file itself explaining why the provider: multus setting was removed.
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

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.

@ormergi
Copy link
Contributor Author

ormergi commented Apr 9, 2025

/cc @akalenyu @nirdothan

@ormergi
Copy link
Contributor Author

ormergi commented Apr 9, 2025

@akalenyu could you please verify this PR changes fixes the issue on CDI+Istio lane?

@kubevirt-bot
Copy link
Contributor

@ormergi: 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
check-provision-k8s-1.31-s390x 55c1860 link false /test check-provision-k8s-1.31-s390x

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dco-signoff: yes Indicates the PR's author has DCO signed all their commits. sig/network size/XS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants