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

multus: bump to multus-v4 (thick plugin) #1433

Merged
merged 3 commits into from
Oct 31, 2022

Conversation

maiqueb
Copy link
Contributor

@maiqueb maiqueb commented Oct 7, 2022

What this PR does / why we need it:
The multus bump script was updated to:

  • use a different multus manifest - multus-daemonset-thick.yml
  • ignore comments in the manifest file. Comments in the manifests broke the yaml-utils::split_yaml_by_seperator function.

Special notes for your reviewer:

Release note:

Consume multus v4, which operates as a thick plugin.

@kubevirt-bot kubevirt-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Oct 7, 2022
@maiqueb maiqueb force-pushed the consume-multus-thick branch 4 times, most recently from f8568c2 to c3ca44b Compare October 17, 2022 13:51
@maiqueb
Copy link
Contributor Author

maiqueb commented Oct 17, 2022

/test pull-e2e-cluster-network-addons-operator-kubemacpool-functests

Copy link
Collaborator

@RamLavi RamLavi left a comment

Choose a reason for hiding this comment

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

just some preliminary comments, feel free to disregard if it's not helpful to you :)

components.yaml Show resolved Hide resolved
pkg/components/components.go Outdated Show resolved Hide resolved
@maiqueb
Copy link
Contributor Author

maiqueb commented Oct 26, 2022

/test pull-e2e-cluster-network-addons-operator-macvtap-cni-functests

The multus bump script was updated to:
- use a different multus manifest - `multus-daemonset-thick.yml`
- ignore comments in the manifest file. Comments in the manifests
  broke the `yaml-utils::split_yaml_by_seperator` function.

Signed-off-by: Miguel Duarte Barroso <[email protected]>
Signed-off-by: Miguel Duarte Barroso <[email protected]>
@maiqueb maiqueb force-pushed the consume-multus-thick branch from 0b8b576 to 0e38c12 Compare October 27, 2022 19:43
@maiqueb
Copy link
Contributor Author

maiqueb commented Oct 27, 2022

Had to rebase latest master to address the macvtap issue.

@maiqueb
Copy link
Contributor Author

maiqueb commented Oct 31, 2022

We're being held back for k8snetworkplumbingwg/multus-cni#944 ...

Until multus bug [0] is fixed, we should consume a version that works,
to allow the hotplug feature effort to continue forward.

[0] - k8snetworkplumbingwg/multus-cni#944

Signed-off-by: Miguel Duarte Barroso <[email protected]>
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@maiqueb
Copy link
Contributor Author

maiqueb commented Oct 31, 2022

/cc @phoracek

@kubevirt-bot kubevirt-bot requested a review from phoracek October 31, 2022 10:46
Copy link
Collaborator

@RamLavi RamLavi left a comment

Choose a reason for hiding this comment

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

Can you move the last commit multus, temporal hack: use untagged multus version to be the first?
then the "old first commit" aka multus: bump to multus-v4 (thick plugin) will only deal with the changes made to the bump script and it's outputs

@maiqueb
Copy link
Contributor Author

maiqueb commented Oct 31, 2022

Can you move the last commit multus, temporal hack: use untagged multus version to be the first? then the "old first commit" aka multus: bump to multus-v4 (thick plugin) will only deal with the changes made to the bump script and it's outputs

I can, but I don't see the advantage. What does that achieve ?

@RamLavi
Copy link
Collaborator

RamLavi commented Oct 31, 2022

Can you move the last commit multus, temporal hack: use untagged multus version to be the first? then the "old first commit" aka multus: bump to multus-v4 (thick plugin) will only deal with the changes made to the bump script and it's outputs

I can, but I don't see the advantage. What does that achieve ?

Since commits in this repo are squashed to 1 commit per PR, then it doesn't really matter, but if someone looks back at this PR then the first commit seems to use a wrong commit, that will surely break cause the bump fails to retrieve the tag --> SHA digest..
My intent is only to make it more readable, but if it is to much of a hustle, I won't insist

@maiqueb
Copy link
Contributor Author

maiqueb commented Oct 31, 2022

Can you move the last commit multus, temporal hack: use untagged multus version to be the first? then the "old first commit" aka multus: bump to multus-v4 (thick plugin) will only deal with the changes made to the bump script and it's outputs

I can, but I don't see the advantage. What does that achieve ?

Since commits in this repo are squashed to 1 commit per PR, then it doesn't really matter, but if someone looks back at this PR then the first commit seems to use a wrong commit, that will surely break cause the bump fails to retrieve the tag --> SHA digest.. My intent is only to make it more readable, but if it is to much of a hustle, I won't insist

The first commit is the correct one - it uses the tag, that unfortunately has a bug. The top most commit is the patched workaround for us to move forward.

I'd prefer to leave this as is.
@RamLavi

@RamLavi
Copy link
Collaborator

RamLavi commented Oct 31, 2022

I'd prefer to leave this as is.

Ok
/lgtm

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Oct 31, 2022
@RamLavi
Copy link
Collaborator

RamLavi commented Oct 31, 2022

@qinqon can you have a look as well?

@qinqon
Copy link
Collaborator

qinqon commented Oct 31, 2022

/lgtm
/approve

@kubevirt-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: qinqon

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

The pull request process is described 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

@kubevirt-bot kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 31, 2022
@kubevirt-bot kubevirt-bot merged commit 146462c into kubevirt:main Oct 31, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants