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

ovs: Fix ovs cni bumper and bump ovs-cni #1822

Merged
merged 1 commit into from
Jul 3, 2024

Conversation

oshoval
Copy link
Collaborator

@oshoval oshoval commented Jul 3, 2024

What this PR does / why we need it:
Since the image repository was changed, the scripts had to be updated.
bump ovs-cni to v0.34.0

Special notes for your reviewer:

Release note:

bump ovs-cni to v0.34.0

Since the image repository was changed, the scripts had to be updated.

Signed-off-by: Or Shoval <oshoval@redhat.com>
@kubevirt-bot kubevirt-bot added the dco-signoff: yes Indicates the PR's author has DCO signed all their commits. label Jul 3, 2024
@kubevirt-bot kubevirt-bot requested review from phoracek and qinqon July 3, 2024 11:12
@kubevirt-bot kubevirt-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note-none Denotes a PR that doesn't merit a release note. size/S and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jul 3, 2024
@oshoval oshoval mentioned this pull request Jul 3, 2024
@kubevirt-bot kubevirt-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Jul 3, 2024
@oshoval
Copy link
Collaborator Author

oshoval commented Jul 3, 2024

/cc @phoracek @qinqon
can you review please ?

@kubevirt-bot
Copy link
Collaborator

@oshoval: GitHub didn't allow me to request PR reviews from the following users: ram.

Note that only kubevirt members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @ram @phoracek @qinqon
can you review please ?

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.

@oshoval
Copy link
Collaborator Author

oshoval commented Jul 3, 2024

/cc @RamLavi
ptal

@kubevirt-bot kubevirt-bot requested a review from RamLavi July 3, 2024 12:18
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.

@oshoval don't you want to only fix the script and wait until the auto bumper works?
It would be a good validation..

@oshoval
Copy link
Collaborator Author

oshoval commented Jul 3, 2024

@oshoval don't you want to only fix the script and wait until the auto bumper works? It would be a good validation..

No need, i ran the script manually, to validate it, the script did those changes, not manual
(i changed the image name and the components.yaml as the auto bumper did on the broken PR)
and ran CNAO_VERSION=99.0.0 ./hack/components/bump-ovs-cni.sh

Moreover it is better to have them both aligned (hence together), splitting it is confusing and not required

@oshoval
Copy link
Collaborator Author

oshoval commented Jul 3, 2024

soon i am going to fix another thing on OVS and it will then ran the bumper again once there is a new version
k8snetworkplumbingwg/ovs-cni#319

this PR is totally safe imo

@oshoval
Copy link
Collaborator Author

oshoval commented Jul 3, 2024

We must have them together
because we need to change the image name on the two files
so the sed will work
https://github.com/kubevirt/cluster-network-addons-operator/pull/1822/files#diff-f1531df30500812ec42a33a52023c9ceca8a93d4972132fd241ad143b107c063R38
https://github.com/kubevirt/cluster-network-addons-operator/pull/1822/files#diff-16d9ad0b21e86450ebe97edb5dfb602819e682c88a76e0bd65c87fc87d4f0f0cR63

but we can't just change the image name without the hash
hence all those changes must come together
(but again i did it as close to by the book as i can / required)

@oshoval oshoval added the lgtm Indicates that a PR is ready to be merged. label Jul 3, 2024
@oshoval
Copy link
Collaborator Author

oshoval commented Jul 3, 2024

/approve

@kubevirt-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: oshoval

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 Jul 3, 2024
@kubevirt-bot kubevirt-bot merged commit bd3cc37 into kubevirt:main Jul 3, 2024
15 checks passed
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/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants